diff --git a/src/macro-action-edit.cpp b/src/macro-action-edit.cpp
index acac1988..839e0aca 100644
--- a/src/macro-action-edit.cpp
+++ b/src/macro-action-edit.cpp
@@ -183,7 +183,9 @@ void AdvSceneSwitcher::on_actionAdd_clicked()
 	} else {
 		AddMacroAction(currentActionIdx + 1);
 	}
-	MacroActionSelectionChanged(currentActionIdx + 1);
+	if (currentActionIdx != -1) {
+		MacroActionSelectionChanged(currentActionIdx + 1);
+	}
 	actionsList->SetHelpMsgVisible(false);
 }
 
diff --git a/src/macro-condition-edit.cpp b/src/macro-condition-edit.cpp
index e5a026e6..ad719135 100644
--- a/src/macro-condition-edit.cpp
+++ b/src/macro-condition-edit.cpp
@@ -311,7 +311,9 @@ void AdvSceneSwitcher::on_conditionAdd_clicked()
 	} else {
 		AddMacroCondition(currentConditionIdx + 1);
 	}
-	MacroConditionSelectionChanged(currentConditionIdx + 1);
+	if (currentConditionIdx != -1) {
+		MacroConditionSelectionChanged(currentConditionIdx + 1);
+	}
 	conditionsList->SetHelpMsgVisible(false);
 }