diff --git a/ts/editor/editor-toolbar/BlockButtons.svelte b/ts/editor/editor-toolbar/BlockButtons.svelte
index 8f0243b25..624ceefa4 100644
--- a/ts/editor/editor-toolbar/BlockButtons.svelte
+++ b/ts/editor/editor-toolbar/BlockButtons.svelte
@@ -3,6 +3,8 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
+    import { onMount } from "svelte";
+
     import ButtonGroup from "../../components/ButtonGroup.svelte";
     import ButtonGroupItem, {
         createProps,
@@ -13,12 +15,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import DynamicallySlottable from "../../components/DynamicallySlottable.svelte";
     import IconButton from "../../components/IconButton.svelte";
     import Popover from "../../components/Popover.svelte";
-    import Shortcut from "../../components/Shortcut.svelte";
     import WithFloating from "../../components/WithFloating.svelte";
     import { execCommand } from "../../domlib";
     import { getListItem } from "../../lib/dom";
+    import { preventDefault } from "../../lib/events";
     import * as tr from "../../lib/ftl";
-    import { getPlatformString } from "../../lib/shortcuts";
+    import { getPlatformString, registerShortcut } from "../../lib/shortcuts";
     import { context } from "../NoteEditor.svelte";
     import { editingInputIsRichText } from "../rich-text-input";
     import CommandIconButton from "./CommandIconButton.svelte";
@@ -54,6 +56,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
+    onMount(() => {
+        registerShortcut((event: KeyboardEvent) => {
+            preventDefault(event);
+            indentListItem();
+        }, indentKeyCombination);
+        registerShortcut((event: KeyboardEvent) => {
+            preventDefault(event);
+            outdentListItem();
+        }, outdentKeyCombination);
+    });
+
     const { focusedInput } = context.get();
 
     $: disabled = !editingInputIsRichText($focusedInput);
@@ -146,11 +159,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                                 {@html outdentIcon}
                             </IconButton>
 
-                            <Shortcut
-                                keyCombination={outdentKeyCombination}
-                                on:action={outdentListItem}
-                            />
-
                             <IconButton
                                 tooltip="{tr.editingIndent()} ({getPlatformString(
                                     indentKeyCombination,
@@ -161,11 +169,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                             >
                                 {@html indentIcon}
                             </IconButton>
-
-                            <Shortcut
-                                keyCombination={indentKeyCombination}
-                                on:action={indentListItem}
-                            />
                         </ButtonGroup>
                     </ButtonToolbar>
                 </Popover>