diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 85cc257c07..3ecd45e965 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -1325,6 +1325,7 @@
 			this.configToolStripMenuItem.Name = "configToolStripMenuItem";
 			this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19);
 			this.configToolStripMenuItem.Text = "&Config";
+			this.configToolStripMenuItem.DropDownOpened += new System.EventHandler(this.configToolStripMenuItem_DropDownOpened);
 			// 
 			// controllersToolStripMenuItem
 			// 
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 96737b40ad..4f68f38cea 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -4197,5 +4197,10 @@ namespace BizHawk.MultiClient
 				return EMUVERSION;
 			}
 		}
+
+		private void configToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+		{
+			controllersToolStripMenuItem.Enabled = !(Global.Emulator is NullEmulator);
+		}
 	}
 }
diff --git a/BizHawk.MultiClient/output/defctrl.json b/BizHawk.MultiClient/output/defctrl.json
index b300e1fef5..d1cc190fb8 100644
--- a/BizHawk.MultiClient/output/defctrl.json
+++ b/BizHawk.MultiClient/output/defctrl.json
@@ -20,6 +20,58 @@
       "P2 B": "",
       "P2 A": ""
     },
+    "SNES Controller": {
+      "P1 Up": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "P1 Down": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "P1 Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "P1 Right": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "P1 Select": "Space, X1 Back",
+      "P1 Start": "Return, X1 Start",
+      "P1 B": "X, X1 B",
+      "P1 A": "Z, X1 A",
+      "P1 X": "S, X1 Y",
+      "P1 Y": "A, X1 X",
+      "P1 L": "W, X1 Left Trigger",
+      "P1 R": "E, X1 Right Trigger",
+      "Reset": "",
+      "Power": "",
+      "P3 Up": "",
+      "P3 Down": "",
+      "P3 Left": "",
+      "P3 Right": "",
+      "P3 Select": "",
+      "P3 Start": "",
+      "P3 B": "",
+      "P3 A": "",
+      "P3 X": "",
+      "P3 Y": "",
+      "P3 L": "",
+      "P3 R": "",
+      "P3 Up": "",
+      "P3 Down": "",
+      "P3 Left": "",
+      "P3 Right": "",
+      "P3 Select": "",
+      "P3 Start": "",
+      "P3 B": "",
+      "P3 A": "",
+      "P3 X": "",
+      "P3 Y": "",
+      "P3 L": "",
+      "P3 R": "",
+      "P4 Up": "",
+      "P4 Down": "",
+      "P4 Left": "",
+      "P4 Right": "",
+      "P4 Select": "",
+      "P4 Start": "",
+      "P4 B": "",
+      "P4 A": "",
+      "P4 X": "",
+      "P4 Y": "",
+      "P4 L": "",
+      "P4 R": "",
+    },
     "Gameboy Controller": {
       "Up": "UpArrow, X1 DpadUp, X1 LStickUp",
       "Down": "DownArrow, X1 DpadDown, X1 LStickDown",
@@ -31,6 +83,19 @@
       "Start": "Return, X1 Start",
       "Power": "",
     },
+    "GBAController": {
+      "Up": "UpArrow, X1 DpadUp, X1 LStickUp",
+      "Down": "DownArrow, X1 DpadDown, X1 LStickDown",
+      "Left": "LeftArrow, X1 DpadLeft, X1 LStickLeft",
+      "Right": "RightArrow, X1 DpadRight, X1 LStickRight",
+      "A": "X, X1 B",
+      "B": "Z, X1 A",
+      "Start": "Return, X1 Start",
+      "Select": "Space, X1 Back",
+      "L": "W, X1 LeftTrigger",
+      "R": "E, X1 RightTrigger",
+      "Power": "",
+    },
     "Saturn Controller": {
       "Power": "",
       "Reset": "",