diff --git a/app/routes/_data.machines._index/dialogs/tags.tsx b/app/routes/_data.machines._index/dialogs/tags.tsx
index c94f435..418c845 100644
--- a/app/routes/_data.machines._index/dialogs/tags.tsx
+++ b/app/routes/_data.machines._index/dialogs/tags.tsx
@@ -124,7 +124,11 @@ export default function Tags({ machine, state }: TagsProps) {
 											!tag.startsWith('tag:')
 											&& 'opacity-50 cursor-not-allowed',
 										)}
-										isDisabled={!tag.startsWith('tag:')}
+										isDisabled={
+											tag.length === 0
+											|| !tag.startsWith('tag:')
+											|| tags.includes(tag)
+										}
 										onPress={() => {
 											setTags([...tags, tag])
 											setTag('')