diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 7bab4a61f1..07110b24e2 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -174,6 +174,8 @@ namespace OpenRA
 				var integralTickTimestep = (uiTickDelta / Timestep) * Timestep;
 				Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep;
 
+				Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
+
 				Sync.CheckSyncUnchanged(world, Ui.Tick);
 				cursorFrame += 0.5f;
 			}
@@ -191,9 +193,6 @@ namespace OpenRA
 					var integralTickTimestep = (worldTickDelta / worldTimestep) * worldTimestep;
 					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
-					if (orderManager.GameStarted)
-						++Viewport.TicksSinceLastMove;
-
 					Sound.Tick();
 					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);