diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 52e708c6b..2f7580621 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -41,6 +41,9 @@ module.exports = {
             parser: "svelte-eslint-parser",
             parserOptions: {
                 parser: "@typescript-eslint/parser",
+                svelteFeatures: {
+                    experimentalGenerics: true,
+                },
             },
             rules: {
                 "svelte/no-at-html-tags": "off",
diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index 58880e86e..d79543ff0 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -13,7 +13,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         selectedDeck: DeckNameId | null;
         onChange?: (deck: DeckNameId) => void;
     }
-    let {selectedDeck = $bindable(null), onChange}: Props = $props();
+    let { selectedDeck = $bindable(null), onChange }: Props = $props();
     let decks: DeckNameId[] = $state([]);
 
     $effect(() => {
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index fb12eeba7..8075f611f 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -22,7 +22,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         onChange?: (item: Item) => void;
     }
 
-    let { title, onChange, icon, items, selectedItem = $bindable(null), keyCombination, tooltip }: Props = $props();
+    let {
+        title,
+        onChange,
+        icon,
+        items,
+        selectedItem = $bindable(null),
+        keyCombination,
+        tooltip,
+    }: Props = $props();
     let modal: Modal | null = $state(null);
     let searchQuery = $state("");
 
@@ -57,7 +65,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     {selectedItem?.name ?? "…"}
 </LabelButton>
 
-<Shortcut keyCombination={keyCombination} on:action={() => modal?.toggle()} />
+<Shortcut {keyCombination} on:action={() => modal?.toggle()} />
 <Modal bind:this={modal} dialogClass="modal-lg">
     <div slot="header" class="modal-header">
         <IconConstrain iconSize={90}>
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index 4241145ac..1feb82c99 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -14,7 +14,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         selectedNotetype: NotetypeNameId | null;
         onChange?: (notetype: NotetypeNameId) => void;
     }
-    let {selectedNotetype = $bindable(null), onChange}: Props = $props();
+    let { selectedNotetype = $bindable(null), onChange }: Props = $props();
     let notetypes: NotetypeNameId[] = $state([]);
 
     $effect(() => {
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 5cab396ad..6e0f1b7dd 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -300,14 +300,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let selectedNotetype: NotetypeNameId | null = null;
     export let selectedDeck: DeckNameId | null = null;
 
-
     function onNotetypeChange(notetype: NotetypeNameId) {
         loadNote(0n, notetype.id, 0, null);
     }
 
-    function onDeckChange(deck: DeckNameId) {
-        selectedDeck = deck;
-    }
     let notetypeMeta: NotetypeIdAndModTime;
     function setNotetypeMeta(notetype: Notetype): void {
         notetypeMeta = { id: notetype.id, modTime: notetype.mtimeSecs };
@@ -1209,7 +1205,7 @@ components and functionality for general note editing.
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
     {#if mode === "add" && !isLegacy}
-        <EditorChoosers bind:selectedNotetype bind:selectedDeck onNotetypeChange={onNotetypeChange} />
+        <EditorChoosers bind:selectedNotetype bind:selectedDeck {onNotetypeChange} />
     {/if}
 
     <EditorToolbar {size} {wrap} api={toolbar}>
diff --git a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
index ea66956e4..815c1fbdc 100644
--- a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
@@ -16,8 +16,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         onNotetypeChange?: (notetype: NotetypeNameId) => void;
         onDeckChange?: (deck: DeckNameId) => void;
     }
-    let {selectedNotetype = $bindable(null), selectedDeck = $bindable(null), onNotetypeChange, onDeckChange}: Props = $props();
-
+    let {
+        selectedNotetype = $bindable(null),
+        selectedDeck = $bindable(null),
+        onNotetypeChange,
+        onDeckChange,
+    }: Props = $props();
 </script>
 
 <div class="top-bar">