diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 6e9f73a86..3e088ea24 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -215,6 +215,10 @@ function initialize_menu()
 //---------------------------------------------------------------------- summary
   if ( ($block=$menu->get_block('mbMenu')) != null )
   {
+    // quick search block will be displayed only if data['qsearch'] is set
+    // to "yes"
+    $block->data['qsearch']='yes';
+
     // tags link
     $block->data['tags'] =
       array(
diff --git a/template/yoga/menubar_menu.tpl b/template/yoga/menubar_menu.tpl
index c16fae690..16c02f618 100644
--- a/template/yoga/menubar_menu.tpl
+++ b/template/yoga/menubar_menu.tpl
@@ -1,11 +1,13 @@
 <dt>{'title_menu'|@translate}</dt>
 <dd>
-	<form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
-		<p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
-			<input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"/>
-		</p>
-	</form>
-	<script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+  {if isset($block->data.qsearch) and  $block->data.qsearch=="yes"}
+    <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
+      <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
+        <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"/>
+      </p>
+    </form>
+    <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+  {/if}
 
 	<ul>
 	{foreach from=$block->data item=link}