diff --git a/toolkit/modules/Finder.jsm b/toolkit/modules/Finder.jsm
index 7de2e424389..4a548c40d95 100644
--- a/toolkit/modules/Finder.jsm
+++ b/toolkit/modules/Finder.jsm
@@ -36,8 +36,9 @@ Finder.prototype = {
     this._listeners = this._listeners.filter(l => l != aListener);
   },
 
-  _notify: function (aSearchString, aResult, aFindBackwards, aDrawOutline) {
-    this._searchString = aSearchString;
+  _notify: function (aSearchString, aResult, aFindBackwards, aDrawOutline, aStoreResult = true) {
+    if (aStoreResult)
+      this._searchString = aSearchString;
     this._outlineLink(aDrawOutline);
 
     let foundLink = this._fastFind.foundLink;
@@ -62,6 +63,7 @@ Finder.prototype = {
       linkURL: linkURL,
       rect: this._getResultRect(),
       searchString: this._searchString,
+      storeResult: aStoreResult
     };
 
     for (let l of this._listeners) {
@@ -110,7 +112,7 @@ Finder.prototype = {
     if (aHighlight) {
       let result = found ? Ci.nsITypeAheadFind.FIND_FOUND
                          : Ci.nsITypeAheadFind.FIND_NOTFOUND;
-      this._notify(aWord, result, false, false);
+      this._notify(aWord, result, false, false, false);
     }
   },