diff --git a/ts/editor/TagEditor.svelte b/ts/editor/TagEditor.svelte
index 7cb746315..36356090e 100644
--- a/ts/editor/TagEditor.svelte
+++ b/ts/editor/TagEditor.svelte
@@ -109,7 +109,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         start: number,
         end: number
     ): Promise<void> {
-        if (autocomplete.isVisible()) {
+        if (autocomplete.hasSelected()) {
             autocomplete.chooseSelected();
         } else {
             splitTag(index, start, end);
diff --git a/ts/editor/WithAutocomplete.svelte b/ts/editor/WithAutocomplete.svelte
index 61c0a207f..4f88d55af 100644
--- a/ts/editor/WithAutocomplete.svelte
+++ b/ts/editor/WithAutocomplete.svelte
@@ -78,6 +78,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
+    function hasSelected(): boolean {
+        return selected !== null;
+    }
+
     const createAutocomplete =
         (createDropdown: (element: HTMLElement) => Dropdown) =>
         (element: HTMLElement): any => {
@@ -92,6 +96,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 selectPrevious,
                 selectNext,
                 chooseSelected,
+                hasSelected,
                 update,
             };