diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index 9df6237303c08..ea7097913cd77 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -306,6 +306,10 @@ var PDFViewer = (function pdfViewer() {
         if (this.defaultRenderingQueue) {
           this.update();
         }
+
+        if (this.findController) {
+          this.findController.resolveFirstPage();
+        }
       }.bind(this));
     },
 
diff --git a/web/viewer.js b/web/viewer.js
index 69b003daad7f6..ab0de99edbf5c 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -932,8 +932,6 @@ var PDFViewerApplication = {
 
       self.loadingBar.setWidth(document.getElementById('viewer'));
 
-      self.findController.resolveFirstPage();
-
       if (!PDFJS.disableHistory && !self.isViewerEmbedded) {
         // The browsing history is only enabled when the viewer is standalone,
         // i.e. not when it is embedded in a web page.