diff --git a/mozilla/toolkit/mozapps/extensions/content/extensions.js b/mozilla/toolkit/mozapps/extensions/content/extensions.js
index 2b38efe9ef4..8a0b78409fa 100644
--- a/mozilla/toolkit/mozapps/extensions/content/extensions.js
+++ b/mozilla/toolkit/mozapps/extensions/content/extensions.js
@@ -642,6 +642,7 @@ function displaySearchThrobber(aKey) {
 function resetSearch() {
   var searchbox = document.getElementById("searchbox");
   searchbox.value = "";
+  searchbox.focus();
   retrieveRepositoryAddons("");
 }
 
diff --git a/mozilla/toolkit/mozapps/extensions/content/extensions.xml b/mozilla/toolkit/mozapps/extensions/content/extensions.xml
index b78fd347313..0372abc707b 100644
--- a/mozilla/toolkit/mozapps/extensions/content/extensions.xml
+++ b/mozilla/toolkit/mozapps/extensions/content/extensions.xml
@@ -921,6 +921,7 @@
           this.setAttribute("value", "");
           this._cancelButton.hidden = true;
           this._searchButton.hidden = false;
+          this.focus();
         </body>
       </method>
 
@@ -936,6 +937,11 @@
     </implementation>
     
     <handlers>
+      <handler event="focus" phase="capturing">
+        if (event.originalTarget == this)
+          this.textbox.focus(); // Forward focus to actual textbox
+      </handler>
+
       <handler event="keypress" keycode="VK_ENTER">
         if (event.originalTarget == this.textbox.inputField) {
           this.startSearch();