diff --git a/server/ui-src/components/NavTags.vue b/server/ui-src/components/NavTags.vue
index 05d3de8..5632d72 100644
--- a/server/ui-src/components/NavTags.vue
+++ b/server/ui-src/components/NavTags.vue
@@ -19,7 +19,7 @@ export default {
 				return false
 			}
 
-			let re = new RegExp(`\\b[^\-!]tag:"?${tag}"?\\b`, 'i')
+			let re = new RegExp(`(^|\\s)tag:"?${tag}"?($|\\s)`, 'i')
 			return query.match(re)
 		}
 	}