diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 58298dab8e..fe6687df98 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -3234,6 +3234,23 @@ namespace BizHawk.Client.EmuHawk
 
 		private void MainForm_Shown(object sender, EventArgs e)
 		{
+			if (Emulator is TI83 && Global.Config.TI83autoloadKeyPad)
+			{
+				GlobalWin.Tools.Load<TI83KeyPad>();
+			}
+
+			GlobalWin.Tools.AutoLoad();
+
+			if (Global.Config.RecentWatches.AutoLoad)
+			{
+				GlobalWin.Tools.LoadRamWatch(!Global.Config.DisplayRamWatch);
+			}
+
+			if (Global.Config.RecentCheats.AutoLoad)
+			{
+				GlobalWin.Tools.Load<Cheats>();
+			}
+
 			HandlePlatformMenus();
 		}
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 440eca5746..a4c773fa49 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -387,18 +387,6 @@ namespace BizHawk.Client.EmuHawk
 				else GlobalWin.Tools.LuaConsole.LoadLuaFile(_argParser.luaScript);
 			}
 
-			GlobalWin.Tools.AutoLoad();
-
-			if (Global.Config.RecentWatches.AutoLoad)
-			{
-				GlobalWin.Tools.LoadRamWatch(!Global.Config.DisplayRamWatch);
-			}
-
-			if (Global.Config.RecentCheats.AutoLoad)
-			{
-				GlobalWin.Tools.Load<Cheats>();
-			}
-
 			SetStatusBar();
 
 			if (Global.Config.StartPaused)
@@ -3613,11 +3601,6 @@ namespace BizHawk.Client.EmuHawk
 						Emulator.CoreComm.RomStatusAnnotation = "Multi-disk bundler";
 					}
 
-					if (Emulator is TI83 && Global.Config.TI83autoloadKeyPad)
-					{
-						GlobalWin.Tools.Load<TI83KeyPad>();
-					}
-
 					if (loader.LoadedEmulator is NES nes)
 					{
 						if (!string.IsNullOrWhiteSpace(nes.GameName))