diff --git a/ts/lib/tag-editor/TagEditMode.svelte b/ts/lib/tag-editor/TagEditMode.svelte
index 49159e439..190e926f8 100644
--- a/ts/lib/tag-editor/TagEditMode.svelte
+++ b/ts/lib/tag-editor/TagEditMode.svelte
@@ -43,9 +43,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 >
     <TagDeleteBadge
         class={hoverClass}
-        on:click={() => {
+        on:click={(evt) => {
             if (!selectMode) {
                 deleteTag();
+                evt.stopPropagation();
             }
         }}
     />
diff --git a/ts/lib/tag-editor/WithAutocomplete.svelte b/ts/lib/tag-editor/WithAutocomplete.svelte
index 6a26ec4ce..87e69047e 100644
--- a/ts/lib/tag-editor/WithAutocomplete.svelte
+++ b/ts/lib/tag-editor/WithAutocomplete.svelte
@@ -76,6 +76,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
      * Choose as accepted suggestion
      */
     async function chooseSelected() {
+        if (!suggestionsItems.length) {
+            return;
+        }
+
         active = true;
         dispatch("choose", { chosen: suggestionsItems[selected ?? -1] });
 
@@ -129,7 +133,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     keepOnKeyup
     show={$show}
     preferredPlacement="top"
-    portalTarget={document.body}
     let:asReference
     on:close={() => show.set(false)}
 >
diff --git a/ts/lib/tag-editor/tag-options-button/TagOptionsButton.svelte b/ts/lib/tag-editor/tag-options-button/TagOptionsButton.svelte
index 44360df74..250ce9c85 100644
--- a/ts/lib/tag-editor/tag-options-button/TagOptionsButton.svelte
+++ b/ts/lib/tag-editor/tag-options-button/TagOptionsButton.svelte
@@ -17,11 +17,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     bind:offsetHeight={badgeHeight}
     on:mousedown|preventDefault
 >
-    {#if tagsSelected}
-        <TagsSelectedButton on:tagselectall on:tagcopy on:tagdelete />
-    {:else}
-        <TagAddButton on:tagappend {keyCombination} />
-    {/if}
+    {#key tagsSelected}
+        {#if tagsSelected}
+            <TagsSelectedButton on:tagselectall on:tagcopy on:tagdelete />
+        {:else}
+            <TagAddButton on:tagappend {keyCombination} />
+        {/if}
+    {/key}
 </div>
 
 <style lang="scss">