diff --git a/src/macro-action-edit.cpp b/src/macro-action-edit.cpp
index 5e9c42f8..844db9bf 100644
--- a/src/macro-action-edit.cpp
+++ b/src/macro-action-edit.cpp
@@ -243,6 +243,7 @@ void AdvSceneSwitcher::MoveMacroActionUp(int idx)
 	}
 
 	SwapActions(macro, idx, idx - 1);
+	HighlightAction(idx - 1);
 }
 
 void AdvSceneSwitcher::MoveMacroActionDown(int idx)
@@ -257,4 +258,5 @@ void AdvSceneSwitcher::MoveMacroActionDown(int idx)
 	}
 
 	SwapActions(macro, idx, idx + 1);
+	HighlightAction(idx + 1);
 }
diff --git a/src/macro-condition-edit.cpp b/src/macro-condition-edit.cpp
index adfb1bab..2008aa9a 100644
--- a/src/macro-condition-edit.cpp
+++ b/src/macro-condition-edit.cpp
@@ -379,6 +379,7 @@ void AdvSceneSwitcher::MoveMacroConditionUp(int idx)
 	}
 
 	SwapConditions(macro, idx, idx - 1);
+	HighlightCondition(idx - 1);
 }
 
 void AdvSceneSwitcher::MoveMacroConditionDown(int idx)
@@ -393,4 +394,5 @@ void AdvSceneSwitcher::MoveMacroConditionDown(int idx)
 	}
 
 	SwapConditions(macro, idx, idx + 1);
+	HighlightCondition(idx + 1);
 }