diff --git a/toolkit/modules/FinderHighlighter.jsm b/toolkit/modules/FinderHighlighter.jsm
index 1cd309170070..7ad1aea9ea67 100644
--- a/toolkit/modules/FinderHighlighter.jsm
+++ b/toolkit/modules/FinderHighlighter.jsm
@@ -480,12 +480,10 @@ FinderHighlighter.prototype = {
   onLocationChange() {
     let window = this.finder._getWindow();
     this.hide(window);
-    let dict = this.getForWindow(window);
     this.clear(window);
-    dict.currentFoundRange = dict.lastIteratorParams = dict.previousFoundRange =
-      dict.previousUpdatedRange = null;
-
     this._removeRangeOutline(window);
+
+    gWindows.delete(window.top);
   },
 
   /**