diff --git a/GUI.NET/Config/InputInfo.cs b/GUI.NET/Config/InputInfo.cs
index 21736d10..4561e9c7 100644
--- a/GUI.NET/Config/InputInfo.cs
+++ b/GUI.NET/Config/InputInfo.cs
@@ -177,8 +177,17 @@ namespace Mesen.GUI.Config
 					controllerInfo.Keys[0].PowerPadButtons = presets.PowerPad.PowerPadButtons;
 					controllerInfo.Keys[0].SuborKeyboardButtons = presets.SuborKeyboard.SuborKeyboardButtons;
 					controllerInfo.Keys[0].BandaiMicrophoneButtons = presets.BandaiMicrophone.BandaiMicrophoneButtons;
-
+				} else if(Controllers.Count == 1) {
+					if(controllerInfo.Keys.Count == 0) {
+						controllerInfo.Keys.Add(new KeyMappings());
+					}
+					controllerInfo.Keys[0].PowerPadButtons = presets.PowerPad.PowerPadButtons;
 				}
+
+				while(controllerInfo.Keys.Count < 4) {
+					controllerInfo.Keys.Add(new KeyMappings());
+				}
+
 				Controllers.Add(controllerInfo);
 			}
 		}
diff --git a/GUI.NET/Config/PreferenceInfo.cs b/GUI.NET/Config/PreferenceInfo.cs
index 5f5337af..229c64d8 100644
--- a/GUI.NET/Config/PreferenceInfo.cs
+++ b/GUI.NET/Config/PreferenceInfo.cs
@@ -105,7 +105,7 @@ namespace Mesen.GUI.Config
 				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.ToggleFullscreen, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("F11") }));
 				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.ToggleKeyboardMode, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Scroll Lock") }));
 				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.TakeScreenshot, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("F12") }));
-				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.LoadRandomGame, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Ctrl"), Key2 = InteropEmu.GetKeyCode("Ins") }));
+				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.LoadRandomGame, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Ctrl"), Key2 = InteropEmu.GetKeyCode("Insert") }));
 
 				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.Reset, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Ctrl"), Key2 = InteropEmu.GetKeyCode("R") }));
 				ShortcutKeys1.Add(new ShortcutKeyInfo(EmulatorShortcut.PowerCycle, new KeyCombination() { Key1 = InteropEmu.GetKeyCode("Ctrl"), Key2 = InteropEmu.GetKeyCode("T") }));