diff --git a/ts/editor/TagAutocomplete.svelte b/ts/editor/TagAutocomplete.svelte
index 8ab063afe..76cac084f 100644
--- a/ts/editor/TagAutocomplete.svelte
+++ b/ts/editor/TagAutocomplete.svelte
@@ -13,37 +13,23 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export { className as class };
 
     export let suggestions: string[];
-    export let original: string | undefined;
+    export let search: string;
 
     let autocomplete: Dropdown | undefined;
 
     let displayed: string[] = [];
     let selected: number | null = null;
+
+    export let choice: string | undefined;
+    $: choice = displayed[selected ?? -1];
+
+    // blue highlight
     let active: boolean = false;
 
     function select(index: number) {
         selected = index;
     }
 
-    function choose() {}
-
-    function switchUpDown(event: KeyboardEvent): void {
-        const target = event.currentTarget as HTMLButtonElement;
-        if (event.code === "ArrowUp") {
-            if (target.nextElementSibling) {
-                (target.nextElementSibling as HTMLButtonElement).focus();
-            }
-
-            event.preventDefault();
-        } else if (event.code === "ArrowDown") {
-            if (target.previousElementSibling) {
-                (target.previousElementSibling as HTMLButtonElement).focus();
-            }
-
-            event.preventDefault();
-        }
-    }
-
     const updateAutocomplete =
         (createDropdown: (element: HTMLElement) => Dropdown) =>
         (event: KeyboardEvent): Dropdown => {
@@ -99,7 +85,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     <slot
         updateAutocomplete={updateAutocomplete(createDropdown)}
         {destroyAutocomplete}
-        selected={displayed[selected ?? -1]}
     />
 
     <DropdownMenu id={menuId} class={className}>
diff --git a/ts/editor/TagEditor.svelte b/ts/editor/TagEditor.svelte
index a75ff325f..7a321ed66 100644
--- a/ts/editor/TagEditor.svelte
+++ b/ts/editor/TagEditor.svelte
@@ -33,6 +33,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let active: number | null = null;
     let activeAfterBlur: number | null = null;
 
+    let autocompletionChoice: string | undefined;
+
     function setActiveAfterBlur(value: number): void {
         if (activeAfterBlur === null) {
             activeAfterBlur = value;
@@ -204,7 +206,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             <TagAutocomplete
                 class="d-flex flex-column-reverse"
                 {suggestions}
-                original={tags[active ?? -1]?.name}
+                search={tags[active ?? -1]?.name ?? ""}
+                bind:choice={autocompletionChoice}
                 let:updateAutocomplete
                 let:destroyAutocomplete
             >