Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.45.2.8 -r1.45.2.9
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	9 Oct 2016 08:47:30 -0000	1.45.2.8
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	14 Oct 2016 08:25:24 -0000	1.45.2.9
@@ -35,12 +35,14 @@
     if {![my wikicmds]} {return ""}
     return {
       <%
-         template::add_event_listener \
+      if {$::::xowiki::search_mounted_p} {
+        template::add_event_listener \
           -id wiki-menu-do-search-control \
           -script {
             document.getElementById('do_search').style.display = 'inline';
             document.getElementById('do_search_q').focus();
           }
+      }
       %>
       <div id='wikicmds'>
       <if @view_link@ not nil><a href="@view_link@" accesskey='v' title='#xowiki.view_title#'>#xowiki.view#</a> &middot; </if>