diff --git a/ts/editor/Components.svelte b/ts/editor/Components.svelte
new file mode 100644
index 000000000..92465eefa
--- /dev/null
+++ b/ts/editor/Components.svelte
@@ -0,0 +1,22 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script context="module" lang="typescript">
+    import IconButton from "components/IconButton.svelte";
+    import LabelButton from "components/LabelButton.svelte";
+    import WithShortcut from "components/WithShortcut.svelte";
+    import WithContext from "components/WithContext.svelte";
+    import WithState from "components/WithState.svelte";
+
+    import * as contextKeys from "components/context-keys";
+
+    export const components = {
+        IconButton,
+        LabelButton,
+        WithShortcut,
+        WithContext,
+        WithState,
+        contextKeys,
+    };
+</script>
diff --git a/ts/editor/EditorToolbar.svelte b/ts/editor/EditorToolbar.svelte
index 8056001e7..bc6afd477 100644
--- a/ts/editor/EditorToolbar.svelte
+++ b/ts/editor/EditorToolbar.svelte
@@ -15,17 +15,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         resetAllState(false);
     }
 
-    /* Export components */
+    /* Our dynamic components */
     import AddonButtons from "./AddonButtons.svelte";
     import PreviewButton from "./PreviewButton.svelte";
-    import LabelButton from "components/LabelButton.svelte";
-    import IconButton from "components/IconButton.svelte";
 
     export const editorToolbar = {
         AddonButtons,
         PreviewButton,
-        LabelButton,
-        IconButton,
     };
 </script>
 
diff --git a/ts/editor/index.ts b/ts/editor/index.ts
index af7341f5f..57ac34154 100644
--- a/ts/editor/index.ts
+++ b/ts/editor/index.ts
@@ -26,6 +26,7 @@ export { setNoteId, getNoteId } from "./note-id";
 export { saveNow } from "./change-timer";
 export { wrap, wrapIntoText } from "./wrap";
 export { editorToolbar } from "./toolbar";
+export { components } from "./Components.svelte";
 
 declare global {
     interface Selection {