diff --git a/web/base_viewer.js b/web/base_viewer.js
index 6ce993b98..7fdb5c728 100644
--- a/web/base_viewer.js
+++ b/web/base_viewer.js
@@ -727,12 +727,6 @@ class BaseViewer {
           if (isPureXfa) {
             console.warn("Warning: XFA-editing is not implemented.");
           } else if (isValidAnnotationEditorMode(mode)) {
-            // Ensure that the Editor buttons, in the toolbar, are updated.
-            this.eventBus.dispatch("annotationeditormodechanged", {
-              source: this,
-              mode,
-            });
-
             this.#annotationEditorUIManager = new AnnotationEditorUIManager(
               this.container,
               this.eventBus
@@ -817,6 +811,14 @@ class BaseViewer {
             this._scriptingManager.setDocument(pdfDocument); // Enable scripting.
           }
 
+          if (this.#annotationEditorUIManager) {
+            // Ensure that the Editor buttons, in the toolbar, are updated.
+            this.eventBus.dispatch("annotationeditormodechanged", {
+              source: this,
+              mode: this.#annotationEditorMode,
+            });
+          }
+
           // In addition to 'disableAutoFetch' being set, also attempt to reduce
           // resource usage when loading *very* long/large documents.
           if (
diff --git a/web/toolbar.js b/web/toolbar.js
index d0890a3e2..fea035992 100644
--- a/web/toolbar.js
+++ b/web/toolbar.js
@@ -244,7 +244,6 @@ class Toolbar {
       }
     };
     this.eventBus._on("annotationeditormodechanged", editorModeChanged);
-
     this.eventBus._on("toolbarreset", evt => {
       if (evt.source === this) {
         editorModeChanged(