diff --git a/ts/deckconfig/DeckConfigPage.svelte b/ts/deckconfig/DeckConfigPage.svelte
index 7c48a55de..596ef2624 100644
--- a/ts/deckconfig/DeckConfigPage.svelte
+++ b/ts/deckconfig/DeckConfigPage.svelte
@@ -11,9 +11,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export let state: DeckConfigState;
 
+    let registerCleanup: () => void;
     onMount(() => {
-        onDestroy(registerShortcut(() => state.save(false), "Control+Enter"));
+        registerCleanup = registerShortcut(() => state.save(false), "Control+Enter");
     });
+    onDestroy(() => registerCleanup?.());
 </script>
 
 <style lang="scss">