diff --git a/OpenRa.Game/Traits/Activities/Follow.cs b/OpenRa.Game/Traits/Activities/Follow.cs
index 16b27b7f12..37a5464b6e 100644
--- a/OpenRa.Game/Traits/Activities/Follow.cs
+++ b/OpenRa.Game/Traits/Activities/Follow.cs
@@ -19,7 +19,10 @@ namespace OpenRa.Game.Traits.Activities
 			if (Target == null || Target.IsDead)
 				return NextActivity;
 
-			if( ( Target.Location - self.Location ).LengthSquared >= Range * Range )
+			var canMove = !self.traits.Contains<Building>();
+			var inRange = ( Target.Location - self.Location ).LengthSquared < Range * Range;
+
+			if( canMove && !inRange )
 				return new Move( Target, Range ) { NextActivity = this };
 
 			return null;