diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs
index 1d07325cb4..dea117a0c4 100644
--- a/BizHawk.MultiClient/config/InputWidget.cs
+++ b/BizHawk.MultiClient/config/InputWidget.cs
@@ -32,12 +32,20 @@ namespace BizHawk.MultiClient
 			if (e.KeyCode == Keys.ControlKey) return;
 			if (e.KeyCode == Keys.ShiftKey) return;
 			if (e.KeyCode == Keys.Menu) return;
-			KeyboardBinding kb = new KeyboardBinding();
-			kb.key = e.KeyCode;
-			kb.modifiers = e.Modifiers;
-			Bindings.Clear();
-			Bindings.Add(kb);
-			UpdateLabel();
+            if (e.KeyCode != Keys.Escape)
+            {
+                KeyboardBinding kb = new KeyboardBinding();
+                kb.key = e.KeyCode;
+                kb.modifiers = e.Modifiers;
+                Bindings.Clear();
+                Bindings.Add(kb);
+                UpdateLabel();
+            }
+            else
+            {
+                Bindings.Clear();
+                UpdateLabel();
+            }
 		}
 
 		protected override void OnKeyPress(KeyPressEventArgs e)