RangeFind highlight cleanup stuff and stuff.

2 files changed, 5 insertions, 3 deletions

diff --git a/common/content/events.js b/common/content/events.js
index ca872006..5d1ad674 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -901,7 +901,9 @@ var Events = Module("events", {
             if (elem == null && urlbar && urlbar.inputField == this._lastFocus)
                 util.threadYield(true); // Why? --Kris
 
-            while (modes.main.ownsFocus && modes.topOfStack.params.ownsFocus != elem
+            while (modes.main.ownsFocus
+                    && modes.topOfStack.params.ownsFocus != elem
+                    && modes.topOfStack.params.ownsFocus != win
                     && !modes.topOfStack.params.holdFocus)
                  modes.pop(null, { fromFocus: true });
         }
diff --git a/common/content/modes.js b/common/content/modes.js
index e24911b6..e6a6ccaa 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -291,7 +291,6 @@ var Modes = Module("modes", {
 
     inSet: false,
 
-    // helper function to set both modes in one go
     set: function set(mainMode, extendedMode, params, stack) {
         var delayed, oldExtended, oldMain, prev, push;
 
@@ -628,7 +627,8 @@ var Modes = Module("modes", {
             opts);
     },
     prefs: function initPrefs() {
-        prefs.watch("accessibility.browsewithcaret", function () modes.onCaretChange.apply(modes, arguments));
+        prefs.watch("accessibility.browsewithcaret",
+                    function () { modes.onCaretChange.apply(modes, arguments) });
     }
 });