diff --git a/BizHawk.MultiClient/Input/Input.cs b/BizHawk.MultiClient/Input/Input.cs
index 3ee1d7f9e5..a30ecc5042 100644
--- a/BizHawk.MultiClient/Input/Input.cs
+++ b/BizHawk.MultiClient/Input/Input.cs
@@ -182,7 +182,7 @@ namespace BizHawk.MultiClient
 			}
 		}
 
-		Queue<InputEvent> InputEvents = new Queue<InputEvent>();
+		Queue<InputEvent> InputEvents = new Queue<InputEvent>(); 
 		public InputEvent DequeueEvent()
 		{
 			lock (this)
diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs
index 2073f1a680..5c7852f1be 100644
--- a/BizHawk.MultiClient/config/ControllerConfig.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig.cs
@@ -38,6 +38,18 @@ namespace BizHawk.MultiClient
 			SetAutoTab(true);
 		}
 
+		protected override void OnShown(EventArgs e)
+		{
+			Input.Instance.EnableIgnoreModifiers = true;
+			base.OnShown(e);
+		}
+
+		protected override void OnClosed(EventArgs e)
+		{
+			base.OnClosed(e);
+			Input.Instance.EnableIgnoreModifiers = false;
+		}
+
 		private void SetAutoTab(bool setting)
 		{
 			foreach (Control control1 in tabControl1.TabPages)
diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs
index 3f881741e4..ca4136341a 100644
--- a/BizHawk.MultiClient/config/InputWidget.cs
+++ b/BizHawk.MultiClient/config/InputWidget.cs
@@ -116,8 +116,11 @@ namespace BizHawk.MultiClient
 		{
 			Input.Instance.Update();
 			string TempBindingStr = Input.Instance.GetNextPressedButtonOrNull();
-			if (wasPressed != "" && TempBindingStr == wasPressed) return;
-			if (TempBindingStr != null)
+			if (wasPressed != "" && TempBindingStr == wasPressed)
+			{
+				return;
+			}
+			else if (TempBindingStr != null)
 			{
 				if (TempBindingStr == "Escape")
 				{