diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs
index 20f41b566f..1bc3d1a695 100644
--- a/OpenRa.Game/Controller.cs
+++ b/OpenRa.Game/Controller.cs
@@ -96,7 +96,7 @@ namespace OpenRa.Game
 
 		public Cursor ChooseCursor()
 		{
-			var c = (orderGenerator != null) ? orderGenerator.Order(dragEnd.ToInt2(), false)
+			var c = (orderGenerator is UnitOrderGenerator) ? orderGenerator.Order(dragEnd.ToInt2(), false)
 				.Select(a => a.Cursor)
 				.FirstOrDefault(a => a != null) : null;