diff --git a/CookieMonster.js b/CookieMonster.js
index 50de44c..32be852 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1510,11 +1510,11 @@ CM.Disp.UpdateBackground = function() {
 };
 
 /**
- * This function handles custom drawing for the Game.Draw() function.
+ * This function handles all custom drawing for the Game.Draw() function.
  * It is hooked on 'draw' by CM.RegisterHooks()
  */
 CM.Disp.Draw = function () {
-	// Draw autosave timer in stats menu
+	// Draw autosave timer in stats menu, this must be done here to make it count down correctly
 	if (
 		(Game.prefs.autosave && Game.drawT % 10 == 0) && // with autosave ON and every 10 ticks
 		(Game.onMenu == 'stats' && CM.Options.Stats) // while being on the stats menu only
@@ -1524,6 +1524,25 @@ CM.Disp.Draw = function () {
 			timer.innerText = Game.sayTime(Game.fps * 60 - (Game.T % (Game.fps * 60)), 4);
 		}
 	}
+	// Update colors
+	CM.Disp.UpdateBuildings();
+	CM.Disp.UpdateUpgrades();
+
+	// Redraw timers
+	CM.Disp.UpdateTimerBar();
+
+	// Update Bottom Bar
+	CM.Disp.UpdateBotBar();
+
+	// Update Tooltip
+	CM.Disp.UpdateTooltip();
+
+	// Update Wrinkler Tooltip
+	CM.Disp.CheckWrinklerTooltip();
+	CM.Disp.UpdateWrinklerTooltip();
+
+	// Change menu refresh interval
+	CM.Disp.RefreshMenu();
 };
 
 /********
@@ -4314,26 +4333,6 @@ CM.Loop = function() {
 
 		// Calculate PP
 		CM.Cache.RemakePP();
-
-		// Update colors
-		CM.Disp.UpdateBuildings();
-		CM.Disp.UpdateUpgrades();
-
-		// Redraw timers
-		CM.Disp.UpdateTimerBar();
-
-		// Update Bottom Bar
-		CM.Disp.UpdateBotBar();
-
-		// Update Tooltip
-		CM.Disp.UpdateTooltip();
-
-		// Update Wrinkler Tooltip
-		CM.Disp.CheckWrinklerTooltip();
-		CM.Disp.UpdateWrinklerTooltip();
-
-		// Change menu refresh interval
-		CM.Disp.RefreshMenu();
 	}
 
 	// Check all changing minigames and game-states
diff --git a/src/Disp.js b/src/Disp.js
index e7e2a90..fc77ae9 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -296,11 +296,11 @@ CM.Disp.UpdateBackground = function() {
 };
 
 /**
- * This function handles custom drawing for the Game.Draw() function.
+ * This function handles all custom drawing for the Game.Draw() function.
  * It is hooked on 'draw' by CM.RegisterHooks()
  */
 CM.Disp.Draw = function () {
-	// Draw autosave timer in stats menu
+	// Draw autosave timer in stats menu, this must be done here to make it count down correctly
 	if (
 		(Game.prefs.autosave && Game.drawT % 10 == 0) && // with autosave ON and every 10 ticks
 		(Game.onMenu == 'stats' && CM.Options.Stats) // while being on the stats menu only
@@ -310,6 +310,25 @@ CM.Disp.Draw = function () {
 			timer.innerText = Game.sayTime(Game.fps * 60 - (Game.T % (Game.fps * 60)), 4);
 		}
 	}
+	// Update colors
+	CM.Disp.UpdateBuildings();
+	CM.Disp.UpdateUpgrades();
+
+	// Redraw timers
+	CM.Disp.UpdateTimerBar();
+
+	// Update Bottom Bar
+	CM.Disp.UpdateBotBar();
+
+	// Update Tooltip
+	CM.Disp.UpdateTooltip();
+
+	// Update Wrinkler Tooltip
+	CM.Disp.CheckWrinklerTooltip();
+	CM.Disp.UpdateWrinklerTooltip();
+
+	// Change menu refresh interval
+	CM.Disp.RefreshMenu();
 };
 
 /********
diff --git a/src/Main.js b/src/Main.js
index 7e254f6..6628c02 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -182,26 +182,6 @@ CM.Loop = function() {
 
 		// Calculate PP
 		CM.Cache.RemakePP();
-
-		// Update colors
-		CM.Disp.UpdateBuildings();
-		CM.Disp.UpdateUpgrades();
-
-		// Redraw timers
-		CM.Disp.UpdateTimerBar();
-
-		// Update Bottom Bar
-		CM.Disp.UpdateBotBar();
-
-		// Update Tooltip
-		CM.Disp.UpdateTooltip();
-
-		// Update Wrinkler Tooltip
-		CM.Disp.CheckWrinklerTooltip();
-		CM.Disp.UpdateWrinklerTooltip();
-
-		// Change menu refresh interval
-		CM.Disp.RefreshMenu();
 	}
 
 	// Check all changing minigames and game-states