diff --git a/ts/editor-toolbar/WithShortcut.d.ts b/ts/editor-toolbar/WithShortcut.d.ts
new file mode 100644
index 000000000..2792bb7ae
--- /dev/null
+++ b/ts/editor-toolbar/WithShortcut.d.ts
@@ -0,0 +1,7 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+import type { ToolbarItem } from "./types";
+
+export interface WithShortcutProps {
+    button: ToolbarItem;
+}
diff --git a/ts/editor-toolbar/WithShortcut.svelte b/ts/editor-toolbar/WithShortcut.svelte
new file mode 100644
index 000000000..f3293e761
--- /dev/null
+++ b/ts/editor-toolbar/WithShortcut.svelte
@@ -0,0 +1,37 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="typescript">
+    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+    import type { ToolbarItem } from "./types";
+
+    export let button: ToolbarItem;
+    /* export let event: string; */
+
+    function extend({
+        className,
+        ...rest
+    }: DynamicSvelteComponent): DynamicSvelteComponent {
+        return {
+            ...rest,
+        };
+    }
+
+    function createShortcut({ detail }: CustomEvent): void {
+        const button: HTMLButtonElement = detail.button;
+
+        document.addEventListener("click", () => {
+            const event = new MouseEvent("click");
+
+            if (code === "KeyP") {
+                button.dispatchEvent(event);
+            }
+        });
+    }
+</script>
+
+<svelte:component
+    this={button.component}
+    {...extend(button)}
+    on:mount={createShortcut} />