diff --git a/web/viewer.js b/web/viewer.js
index 759133127..4381e6c2f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -343,10 +343,6 @@ var PDFFindController = {
 
     this.active = true;
 
-    if (!this.state.query) {
-      this.updateUIState(FindStates.FIND_FOUND);
-      return;
-    }
     this.updateUIState(FindStates.FIND_PENDING);
 
     if (this.dirtyMatch) {
@@ -372,7 +368,7 @@ var PDFFindController = {
         }
         this.updatePage(i, true);
       }
-      if (!firstMatch) {
+      if (!firstMatch || !this.state.query) {
         this.updateUIState(FindStates.FIND_FOUND);
       } else {
         this.updateUIState(FindStates.FIND_NOTFOUND);