diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 81a3f89595..bf2e2d621f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3326,17 +3326,17 @@ namespace BizHawk.Client.EmuHawk
 
 			if (result)
 			{
-				if (loader.LoadedEmulator is TI83 && Global.Config.TI83autoloadKeyPad)
-				{
-					GlobalWin.Tools.Load<TI83KeyPad>();
-				}
-
 				Global.Emulator = loader.LoadedEmulator;
 				Global.CoreComm = nextComm;
 				Global.Game = loader.Game;
 				CoreFileProvider.SyncCoreCommInputSignals();
 				InputManager.SyncControls();
 
+				if (Global.Emulator is TI83 && Global.Config.TI83autoloadKeyPad)
+				{
+					GlobalWin.Tools.Load<TI83KeyPad>();
+				}
+
 				if (loader.LoadedEmulator is NES)
 				{
 					var nes = loader.LoadedEmulator as NES;