diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index b5ae41d598..e55b293aad 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -61,8 +61,8 @@ namespace OpenRA.Orders
 				.FirstOrDefault(a => a != null);
 
 			return c ??
-				(world.SelectActorsInBox(Game.CellSize * xy,
-				Game.CellSize * xy).Any()
+				(world.FindUnitsAtMouse(mi.Location)
+				.Any(a => a.Info.Traits.Contains<SelectableInfo>())
 					? "select" : "default");
 		}
 	}