diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs
index 57631a1394..948273f468 100644
--- a/OpenRa.Game/Controller.cs
+++ b/OpenRa.Game/Controller.cs
@@ -166,6 +166,10 @@ namespace OpenRa.Game
 					return;
 
 				controlGroups[group].Clear();
+
+				for (var i = 0; i < 10; i++)	/* all control groups */
+					controlGroups[i].RemoveAll(a => uog.selection.Contains(a));
+
 				controlGroups[group].AddRange(uog.selection);
 				return;
 			}