diff --git a/BizHawk.MultiClient/config/InputConfig.Designer.cs b/BizHawk.MultiClient/config/InputConfig.Designer.cs
index 0356aee40b..0aaf9a2ea4 100644
--- a/BizHawk.MultiClient/config/InputConfig.Designer.cs
+++ b/BizHawk.MultiClient/config/InputConfig.Designer.cs
@@ -33,6 +33,8 @@
 			this.OK = new System.Windows.Forms.Button();
 			this.Cancel = new System.Windows.Forms.Button();
 			this.ButtonsGroupBox = new System.Windows.Forms.GroupBox();
+			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.clearMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.ControllerImage = new System.Windows.Forms.PictureBox();
 			this.ControllerSelectGroupBox = new System.Windows.Forms.GroupBox();
 			this.IDX_CONTROLLERENABLED = new System.Windows.Forms.CheckBox();
@@ -42,12 +44,10 @@
 			this.AllowLR = new System.Windows.Forms.CheckBox();
 			this.AutoTab = new System.Windows.Forms.CheckBox();
 			this.label38 = new System.Windows.Forms.Label();
-			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.clearMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.contextMenuStrip1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit();
 			this.ControllerSelectGroupBox.SuspendLayout();
 			this.SystemGroupBox.SuspendLayout();
-			this.contextMenuStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// OK
@@ -75,9 +75,9 @@
 			// 
 			// ButtonsGroupBox
 			// 
-			this.ButtonsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+			this.ButtonsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
 			this.ButtonsGroupBox.ContextMenuStrip = this.contextMenuStrip1;
 			this.ButtonsGroupBox.Location = new System.Drawing.Point(12, 84);
 			this.ButtonsGroupBox.Name = "ButtonsGroupBox";
@@ -86,10 +86,24 @@
 			this.ButtonsGroupBox.TabStop = false;
 			this.ButtonsGroupBox.Text = "Buttons";
 			// 
+			// contextMenuStrip1
+			// 
+			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.clearMappingsToolStripMenuItem});
+			this.contextMenuStrip1.Name = "contextMenuStrip1";
+			this.contextMenuStrip1.Size = new System.Drawing.Size(158, 26);
+			// 
+			// clearMappingsToolStripMenuItem
+			// 
+			this.clearMappingsToolStripMenuItem.Name = "clearMappingsToolStripMenuItem";
+			this.clearMappingsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.clearMappingsToolStripMenuItem.Text = "&Clear Mappings";
+			this.clearMappingsToolStripMenuItem.Click += new System.EventHandler(this.clearMappingsToolStripMenuItem_Click);
+			// 
 			// ControllerImage
 			// 
-			this.ControllerImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+			this.ControllerImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Right)));
 			this.ControllerImage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
 			this.ControllerImage.Location = new System.Drawing.Point(256, 84);
 			this.ControllerImage.Name = "ControllerImage";
@@ -100,8 +114,8 @@
 			// 
 			// ControllerSelectGroupBox
 			// 
-			this.ControllerSelectGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+			this.ControllerSelectGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
 			this.ControllerSelectGroupBox.Controls.Add(this.IDX_CONTROLLERENABLED);
 			this.ControllerSelectGroupBox.Controls.Add(this.ControllComboBox);
 			this.ControllerSelectGroupBox.Location = new System.Drawing.Point(13, 28);
@@ -195,20 +209,6 @@
 			this.label38.TabIndex = 9;
 			this.label38.Text = "* Escape clears a key mapping";
 			// 
-			// contextMenuStrip1
-			// 
-			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.clearMappingsToolStripMenuItem});
-			this.contextMenuStrip1.Name = "contextMenuStrip1";
-			this.contextMenuStrip1.Size = new System.Drawing.Size(158, 26);
-			// 
-			// clearMappingsToolStripMenuItem
-			// 
-			this.clearMappingsToolStripMenuItem.Name = "clearMappingsToolStripMenuItem";
-			this.clearMappingsToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
-			this.clearMappingsToolStripMenuItem.Text = "&Clear Mappings";
-			this.clearMappingsToolStripMenuItem.Click += new System.EventHandler(this.clearMappingsToolStripMenuItem_Click);
-			// 
 			// InputConfig
 			// 
 			this.AcceptButton = this.OK;
@@ -233,11 +233,12 @@
 			this.Name = "InputConfig";
 			this.Text = "Configure Controllers";
 			this.Load += new System.EventHandler(this.InputConfig_Load);
+			this.Shown += new System.EventHandler(this.InputConfig_Shown);
+			this.contextMenuStrip1.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).EndInit();
 			this.ControllerSelectGroupBox.ResumeLayout(false);
 			this.ControllerSelectGroupBox.PerformLayout();
 			this.SystemGroupBox.ResumeLayout(false);
-			this.contextMenuStrip1.ResumeLayout(false);
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
diff --git a/BizHawk.MultiClient/config/InputConfig.cs b/BizHawk.MultiClient/config/InputConfig.cs
index f75e8848d0..e8eff7385e 100644
--- a/BizHawk.MultiClient/config/InputConfig.cs
+++ b/BizHawk.MultiClient/config/InputConfig.cs
@@ -590,5 +590,10 @@ namespace BizHawk.MultiClient
 				}
 			}
 		}
+
+		private void InputConfig_Shown(object sender, EventArgs e)
+		{
+			SetFocus();
+		}
 	}
 }
\ No newline at end of file