Index: openacs-4/packages/xowiki/resources/templates/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/oacs-view2.adp,v
diff -u -N -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	9 Oct 2016 08:47:29 -0000	1.1.2.8
+++ openacs-4/packages/xowiki/resources/templates/oacs-view2.adp	11 Oct 2016 10:35:07 -0000	1.1.2.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Oct 09 10:46:02 CEST 2016 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Oct 11 12:33:34 CEST 2016 -->
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
@@ -14,10 +14,12 @@
           <div class='xowiki-content'>
 
       <%
-         template::add_event_listener  -id wiki-menu-do-search-control  -script {
+      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>