diff --git a/web/app.js b/web/app.js
index fe6916cb15b5e..d6fb3e7c5f54f 100644
--- a/web/app.js
+++ b/web/app.js
@@ -409,6 +409,7 @@ let PDFViewerApplication = {
 
       this.findController = new PDFFindController({
         pdfViewer: this.pdfViewer,
+        eventBus,
       });
       this.findController.onUpdateResultsCount = (matchCount) => {
         if (this.supportsIntegratedFind) {
diff --git a/web/base_viewer.js b/web/base_viewer.js
index c904a4481406a..4149dd3a21456 100644
--- a/web/base_viewer.js
+++ b/web/base_viewer.js
@@ -479,10 +479,6 @@ class BaseViewer {
       if (this.defaultRenderingQueue) {
         this.update();
       }
-
-      if (this.findController) {
-        this.findController.resolveFirstPage();
-      }
     }).catch((reason) => {
       console.error('Unable to initialize viewer', reason);
     });
diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
index 721788c32a93b..d6810dfb1499d 100644
--- a/web/pdf_find_controller.js
+++ b/web/pdf_find_controller.js
@@ -14,6 +14,7 @@
  */
 
 import { createPromiseCapability } from 'pdfjs-lib';
+import { getGlobalEventBus } from './dom_events';
 import { scrollIntoView } from './ui_utils';
 
 const FindState = {
@@ -45,8 +46,9 @@ const CHARACTERS_TO_NORMALIZE = {
  * Provides search functionality to find a given string in a PDF document.
  */
 class PDFFindController {
-  constructor({ pdfViewer, }) {
+  constructor({ pdfViewer, eventBus = getGlobalEventBus(), }) {
     this.pdfViewer = pdfViewer;
+    this.eventBus = eventBus;
 
     this.onUpdateResultsCount = null;
     this.onUpdateState = null;
@@ -82,7 +84,11 @@ class PDFFindController {
     this.findTimeout = null;
 
     this._firstPagePromise = new Promise((resolve) => {
-      this.resolveFirstPage = resolve;
+      const eventBus = this.eventBus;
+      eventBus.on('pagesinit', function onPagesInit() {
+        eventBus.off('pagesinit', onPagesInit);
+        resolve();
+      });
     });
   }