diff --git a/ts/editor/TagAutocomplete.svelte b/ts/editor/TagAutocomplete.svelte
index 8f0f48979..8ab063afe 100644
--- a/ts/editor/TagAutocomplete.svelte
+++ b/ts/editor/TagAutocomplete.svelte
@@ -9,13 +9,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import DropdownMenu from "components/DropdownMenu.svelte";
     import DropdownItem from "components/DropdownItem.svelte";
 
-    export let suggestions: string[];
-
     let className: string = "";
     export { className as class };
 
+    export let suggestions: string[];
+    export let original: string | undefined;
+
     let autocomplete: Dropdown | undefined;
-    let original: string | undefined;
 
     let displayed: string[] = [];
     let selected: number | null = null;
diff --git a/ts/editor/TagEditor.svelte b/ts/editor/TagEditor.svelte
index 289ce1309..e661108f8 100644
--- a/ts/editor/TagEditor.svelte
+++ b/ts/editor/TagEditor.svelte
@@ -208,6 +208,7 @@ 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}
                 let:updateAutocomplete
                 let:destroyAutocomplete
             >