diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index f8dfe7a24e1e..a195122d843c 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -762,6 +762,9 @@
             this.setAttribute("noanim", true);
           this.hidden = true;
 
+          // 'focusContent()' iterates over all listeners in the chrome
+          // process, so we need to call it from here.
+          this.browser.finder.focusContent();
           this.browser.finder.onFindbarClose();
 
           this._cancelTimers();
diff --git a/toolkit/modules/Finder.jsm b/toolkit/modules/Finder.jsm
index d8b7035b04a5..4adb5c15a133 100644
--- a/toolkit/modules/Finder.jsm
+++ b/toolkit/modules/Finder.jsm
@@ -297,7 +297,6 @@ Finder.prototype = {
   },
 
   onFindbarClose: function() {
-    this.focusContent();
     this.enableSelection();
     this.highlighter.highlight(false);
   },