diff --git a/frontend/src/routes/accounting/add_entry.svelte b/frontend/src/routes/accounting/add_entry.svelte
index eab4357e..ab6aae7a 100644
--- a/frontend/src/routes/accounting/add_entry.svelte
+++ b/frontend/src/routes/accounting/add_entry.svelte
@@ -42,6 +42,7 @@
 	}
 
 	async function getAccountTags(text){
+		if (!text) return [];
 		var url = api(`accounting/${entry.account.id}/tags`)
 		return await getTerminal(text,url);
 	}
@@ -141,7 +142,7 @@
 	<Autocomplete bind:candidate={entry.purpose} getCandidates={getPurposes} />
 
 	<span>{t('tags')}</span>
-	<Tags getCandidates={getAccountTags} module={null} bind:tags={entry.tags} />
+	<Tags getCandidates={getAccountTags} module={null} bind:tags={entry.tags} onEmptyCommit={save} />
 
 	<span></span>
 	<span>
diff --git a/frontend/src/routes/accounting/transaction.svelte b/frontend/src/routes/accounting/transaction.svelte
index 29065314..467570ae 100644
--- a/frontend/src/routes/accounting/transaction.svelte
+++ b/frontend/src/routes/accounting/transaction.svelte
@@ -21,16 +21,17 @@
 	}
 
 	async function getCandidates(key){
+		if (!key) return;
 		var url = api(`accounting/${account.id}/tags`)
 		var res = await post(url,key);
-        if (res.ok){
-            yikes();
-            const input = await res.json();
-            return Object.values(input).map(mapDisplay);
-        } else {
-            error(res);
-            return {};
-        }
+		if (res.ok){
+		    yikes();
+		    const input = await res.json();
+		    return Object.values(input).map(mapDisplay);
+		} else {
+		    error(res);
+		    return {};
+		}
 	}
 
 	function mapDisplay(object){
@@ -127,4 +128,4 @@
 	    </span>
 	</td>
 </tr>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/frontend/src/routes/tags/TagList.svelte b/frontend/src/routes/tags/TagList.svelte
index 103fde82..f9445c8d 100644
--- a/frontend/src/routes/tags/TagList.svelte
+++ b/frontend/src/routes/tags/TagList.svelte
@@ -13,6 +13,7 @@
         id        = null,
         getCandidates = getCandidateTags,
         module,
+        onEmptyCommit = () => {},
         tags      = $bindable([]),
         user_list = [],
     } = $props();
@@ -89,7 +90,9 @@
     }
 
     async function onCommit(wrapped){
-        addTag(wrapped.display);
+        if (!wrapped.display) {
+            onEmptyCommit();
+        } else addTag(wrapped.display);
     }
 
     function onSelect(dummy){}