diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
index 6bbda55929..dbbfb63596 100644
--- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
+++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
@@ -55,7 +55,11 @@ namespace BizHawk.Client.EmuHawk
 				var bindings = _inputs[button].Bindings;
 				if (!string.IsNullOrWhiteSpace(bindings))
 				{
-					saveTo[_buttons[button]] = bindings;
+					saveTo[_buttons[button]] = _inputs[button].Bindings;
+				}
+				else
+				{
+					saveTo.Remove(_buttons[button]);
 				}
 			}
 		}