diff --git a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
index 9196fb022d..8c75406217 100644
--- a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
@@ -45,9 +45,10 @@ namespace OpenRA.Mods.Common.Orders
 			if (target == null)
 				yield break;
 
-			world.CancelInputMode();
-
 			var queued = mi.Modifiers.HasModifier(Modifiers.Shift);
+			if (!queued)
+				world.CancelInputMode();
+
 			yield return new Order(orderName, null, Target.FromActor(target), queued, null, subjects.Where(s => s != target).ToArray());
 		}