diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java
index 59d2f0a..23529ee 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ActionDialog.java
@@ -127,7 +127,7 @@ public class ActionDialog extends TimeCraftersDialog {
             }
         }
 
-        if (!nameUnique) {
+        if (!nameUnique && action == null) {
             message += "Name is not unique!";
 
         } else if (name.length() <= 0) {
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java
index 04db9b5..c39da31 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/GroupDialog.java
@@ -119,7 +119,7 @@ public class GroupDialog extends TimeCraftersDialog {
             }
         }
 
-        if (!nameUnique) {
+        if (!nameUnique && group == null) {
             message += "Name is not unique!";
 
         } else if (name.length() <= 0) {
diff --git a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java
index 8aebfa8..63e21d2 100644
--- a/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java
+++ b/app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/VariableDialog.java
@@ -201,7 +201,7 @@ public class VariableDialog extends TimeCraftersDialog {
             }
         }
 
-        if (!nameUnique) {
+        if (!nameUnique && variable == null) {
             nameMessage += "Name is not unique!";
 
         } else if (name.length() <= 0) {