diff --git a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
index aaf3b5cfec..e3a8dec8ae 100644
--- a/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
@@ -128,6 +128,9 @@ namespace OpenRA.Mods.Common.Orders
 
 		public void Tick(World world)
 		{
+			if (queue.CurrentItem() == null || queue.CurrentItem().Item != building)
+				world.CancelInputMode();
+
 			if (preview == null)
 				return;