diff --git a/OpenRa.Game/Graphics/WorldRenderer.cs b/OpenRa.Game/Graphics/WorldRenderer.cs
index 8a7339a83d..2770e8e10a 100644
--- a/OpenRa.Game/Graphics/WorldRenderer.cs
+++ b/OpenRa.Game/Graphics/WorldRenderer.cs
@@ -69,9 +69,10 @@ namespace OpenRa.Game.Graphics
                     DrawSelectionBox(u, Color.Yellow);
             }
 
-            var selectedUnit = world.game.controller.orderGenerator as Actor;
-            if (selectedUnit != null)
-                DrawSelectionBox(selectedUnit, Color.White);
+            var selection = world.game.controller.orderGenerator as UnitOrderGenerator;
+            if (selection != null)
+				foreach( var a in selection.selection )
+	                DrawSelectionBox(a, Color.White);
 
             
             lineRenderer.Flush();