diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs
index f057d874bc..7d8ffb6d60 100644
--- a/BizHawk.MultiClient/config/InputWidget.cs
+++ b/BizHawk.MultiClient/config/InputWidget.cs
@@ -115,6 +115,7 @@ namespace BizHawk.MultiClient
 				if (TempBindingStr == "Escape")
 				{
 					ClearBindings();
+					HideConflicts();
 					Increment();
 					return;
 				}
@@ -240,8 +241,10 @@ namespace BizHawk.MultiClient
 
 		public void ClearBindings()
 		{
-			for (int x = 0; x < MaxBind; x++)
-				Bindings[x] = "";
+			for (int i = 0; i < MaxBind; i++)
+			{
+				Bindings[i] = "";
+			}
 		}
 
 		public void UpdateLabel()