diff --git a/common/content/finder.js b/common/content/finder.js
index 754987f4..c9b970c0 100644
--- a/common/content/finder.js
+++ b/common/content/finder.js
@@ -448,7 +448,7 @@ function Finder() //{{{
 
             this.clear();
 
-            if (!(options["incsearch"] && str))
+            if (!options["incsearch"] || !str || !found)
             {
                 // prevent any current match from matching again
                 if (!window.content.getSelection().isCollapsed)