diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 5b30b379a8..bc61fea189 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -113,6 +113,8 @@ namespace OpenRA
 				{
 					lastTime += Settings.Game.Timestep;
 					Widget.DoTick(world);
+					if( world.GameHasStarted && world.LocalPlayer != null )
+						++Viewport.TicksSinceLastMove;
 					Sound.Tick();
 					Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate( world ); } );
 
diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs
index 7a2f28cc85..61f85c1808 100644
--- a/OpenRA.Game/Widgets/Widget.cs
+++ b/OpenRA.Game/Widgets/Widget.cs
@@ -338,10 +338,6 @@ namespace OpenRA.Widgets
 		public static void DoTick(World world)
 		{
 			RootWidget.Tick(world);
-			
-			if (!world.GameHasStarted) return;
-			if (world.LocalPlayer == null) return;
-			++Viewport.TicksSinceLastMove;
 		}
 		
 		public static void DoDraw()