diff --git a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
index 1a33a9ca0..70b852e2b 100644
--- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
@@ -171,8 +171,8 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity
   }
 
   private boolean clashes(String newName) {
-    TagData existing = tagDataDao.getTagByName(newName);
-    return existing != null && tagData.getId() != existing.getId();
+    return (isNewTag || !newName.equalsIgnoreCase(tagData.getName()))
+        && tagDataDao.getTagByName(newName) != null;
   }
 
   private void save() {