diff --git a/web/viewer.js b/web/viewer.js
index f5d82b5ca..7d45c1929 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1591,17 +1591,20 @@ document.addEventListener('pagemode', function (evt) {
 }, true);
 
 document.addEventListener('namedaction', function (e) {
+  if (!PDFViewerApplication.initialized) {
+    return;
+  }
   // Processing couple of named actions that might be useful.
   // See also PDFLinkService.executeNamedAction
-  var action = e.action;
+  var action = e.detail.action;
   switch (action) {
     case 'GoToPage':
       document.getElementById('pageNumber').focus();
       break;
 
     case 'Find':
-      if (!this.supportsIntegratedFind) {
-        this.findBar.toggle();
+      if (!PDFViewerApplication.supportsIntegratedFind) {
+        PDFViewerApplication.findBar.toggle();
       }
       break;
   }