--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -832,17 +832,20 @@ var BrowserUI = {
         break;
       case "AppCommand":
         aEvent.stopPropagation();
         switch (aEvent.command) {
           case "Menu":
             this.doCommand("cmd_menu");
             break;
           case "Search":
-            AllPagesList.doCommand();
+            if (!this.activePanel)
+              AllPagesList.doCommand();
+            else
+              this.doCommand("cmd_opensearch");
             break;
           default:
             break;
         }
         break;
       // URL textbox events
       case "click":
         if (this._edit.readOnly)
@@ -873,22 +876,25 @@ var BrowserUI = {
         // Disabled the search button if no search engines are available
         let button = document.getElementById("urlbar-icons");
         if (BrowserSearch.engines.length)
           button.removeAttribute("disabled");
         else
           button.setAttribute("disabled", "true");
 
         break;
-      case "NavigationPanelHidden":
+      case "NavigationPanelHidden": {
         this._edit.collapsed = true;
         this._title.collapsed = false;
 
-        document.getElementById("urlbar-icons").removeAttribute("disabled");
+        let button = document.getElementById("urlbar-icons");
+        button.removeAttribute("open");
+        button.removeAttribute("disabled");
         break;
+      }
     }
   },
 
   receiveMessage: function receiveMessage(aMessage) {
     let browser = aMessage.target;
     let json = aMessage.json;
     switch (aMessage.name) {
       case "DOMTitleChanged":