diff --git a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
index 6a28d40c74..3fa9b58953 100644
--- a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
@@ -23,8 +23,10 @@ namespace OpenRA.Mods.Common.Orders
 
 		protected override IEnumerable<Order> OrderInner(World world, CPos xy, MouseInput mi)
 		{
-			var target = FriendlyGuardableUnits(world, mi).FirstOrDefault();
+			if (mi.Button != ExpectedButton)
+				yield break;
 
+			var target = FriendlyGuardableUnits(world, mi).FirstOrDefault();
 			if (target == null || Subjects.All(s => s.IsDead))
 				yield break;