diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
index 6d61d46ebd..3deecffa21 100644
--- a/MekHQ/src/mekhq/GameThread.java
+++ b/MekHQ/src/mekhq/GameThread.java
@@ -24,6 +24,7 @@
 import megamek.client.bot.BotClient;
 import megamek.client.bot.princess.Princess;
 import megamek.client.ui.swing.ClientGUI;
+import megamek.client.ui.swing.MegaMekGUI;
 import megamek.client.ui.swing.util.MegaMekController;
 import megamek.common.*;
 import megamek.common.planetaryconditions.PlanetaryConditions;
@@ -341,10 +342,8 @@ public void quit() {
     }
 
     public void createController() {
-        controller = new MegaMekController();
-        KeyboardFocusManager kbfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
-        kbfm.addKeyEventDispatcher(controller);
-
-        KeyBindParser.parseKeyBindings(controller);
+        MegaMekGUI megaMekGUI = new MegaMekGUI();
+        megaMekGUI.createController();
+        controller = MegaMekGUI.getKeyDispatcher();
     }
 }