diff --git a/web/pdf_cursor_tools.js b/web/pdf_cursor_tools.js
index 416122b132d04..94c545353457b 100644
--- a/web/pdf_cursor_tools.js
+++ b/web/pdf_cursor_tools.js
@@ -106,7 +106,14 @@ class PDFCursorTools {
 
   #addEventListeners() {
     this.eventBus._on("switchcursortool", evt => {
-      this.switchTool(evt.tool);
+      if (!evt.reset) {
+        this.switchTool(evt.tool);
+      } else if (this.#prevActive !== null) {
+        annotationEditorMode = AnnotationEditorType.NONE;
+        presentationModeState = PresentationModeState.NORMAL;
+
+        enableActive();
+      }
     });
 
     let annotationEditorMode = AnnotationEditorType.NONE,
@@ -131,15 +138,6 @@ class PDFCursorTools {
       }
     };
 
-    this.eventBus._on("secondarytoolbarreset", evt => {
-      if (this.#prevActive !== null) {
-        annotationEditorMode = AnnotationEditorType.NONE;
-        presentationModeState = PresentationModeState.NORMAL;
-
-        enableActive();
-      }
-    });
-
     this.eventBus._on("annotationeditormodechanged", ({ mode }) => {
       annotationEditorMode = mode;
 
diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js
index d4c3c954169d6..296249eecdef4 100644
--- a/web/secondary_toolbar.js
+++ b/web/secondary_toolbar.js
@@ -182,6 +182,7 @@ class SecondaryToolbar {
     this.#updateUIState();
 
     // Reset the Scroll/Spread buttons too, since they're document specific.
+    this.eventBus.dispatch("switchcursortool", { source: this, reset: true });
     this.#scrollModeChanged({ mode: ScrollMode.VERTICAL });
     this.#spreadModeChanged({ mode: SpreadMode.NONE });
   }