diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index a9620505e0..e331de381b 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -39,14 +39,18 @@ namespace OpenRA.Orders
 		{
 			foreach (var a in world.Selection.Actors)
 				foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
-					t.RenderBeforeWorld(a);
+					t.RenderBeforeWorld(a);
+
+			Game.Renderer.Flush();
 		}
 
 		public void RenderAfterWorld( World world )
 		{
 			foreach (var a in world.Selection.Actors)
 				foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
-					t.RenderAfterWorld(a);
+					t.RenderAfterWorld(a);
+
+			Game.Renderer.Flush();
 		}
 
 		public string GetCursor( World world, int2 xy, MouseInput mi )
diff --git a/OpenRA.Game/Traits/DrawLineToTarget.cs b/OpenRA.Game/Traits/DrawLineToTarget.cs
index daba9d5a04..ecf2902cc2 100644
--- a/OpenRA.Game/Traits/DrawLineToTarget.cs
+++ b/OpenRA.Game/Traits/DrawLineToTarget.cs
@@ -63,7 +63,6 @@ namespace OpenRA.Traits
 				Game.Renderer.LineRenderer.DrawLine(p + new float2(1, 1), p + new float2(1, -1), c, c);
 				Game.Renderer.LineRenderer.DrawLine(p + new float2(1, -1), p + new float2(-1, -1), c, c);
 			}
-			Game.Renderer.LineRenderer.Flush();
 		}
 	}
 }