diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel
index d9d4da081..af4796ddf 100644
--- a/ts/editor/BUILD.bazel
+++ b/ts/editor/BUILD.bazel
@@ -141,6 +141,7 @@ esbuild(
         "editor_ts",
         "local_css",
         "svelte_components",
+        "//ts/components",
         "//ts/components:svelte_components",
     ],
 )
diff --git a/ts/editor/EditorToolbar.svelte b/ts/editor/EditorToolbar.svelte
index 700434dac..ad87ca7ad 100644
--- a/ts/editor/EditorToolbar.svelte
+++ b/ts/editor/EditorToolbar.svelte
@@ -15,6 +15,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export function disableButtons(): void {
         disabled.set(true);
     }
+
+    import { updateAllState, resetAllState } from "components/WithState.svelte";
+
+    export function updateActiveButtons(event: Event) {
+        updateAllState(event)
+    }
+
+    export function clearActiveButtons() {
+        resetAllState(false);
+    }
 </script>
 
 <script lang="typescript">
diff --git a/ts/editor/toolbar.ts b/ts/editor/toolbar.ts
index e3d04a154..8cb22a112 100644
--- a/ts/editor/toolbar.ts
+++ b/ts/editor/toolbar.ts
@@ -33,10 +33,5 @@ export function initToolbar(i18n: Promise<void>): Promise<EditorToolbar> {
 }
 
 /* Exports for editor */
-export {
-    updateAllState as updateActiveButtons,
-    resetAllState as clearActiveButtons,
-} from "components/WithState.svelte";
-
 // @ts-expect-error insufficient typing of svelte modules
-export { enableButtons, disableButtons } from "./EditorToolbar.svelte";
+export { enableButtons, disableButtons, updateActiveButtons, clearActiveButtons } from "./EditorToolbar.svelte";