diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
index 0aa51961a3..21f5dd51ae 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
@@ -54,7 +54,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var saveto = SaveConfigObject ?? RealConfigObject;
 			for (int button = 0; button < buttons.Count; button++)
-				saveto[buttons[button]] = Inputs[button].Text;
+				saveto[buttons[button]] = Inputs[button].Bindings;
 		}
 
 		public bool Autotab = false;
diff --git a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
index a38a8a054b..84c06b4c72 100644
--- a/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
@@ -59,7 +59,7 @@ namespace BizHawk.Client.EmuHawk
 			foreach (var w in InputWidgets)
 			{
 				var b = Global.Config.HotkeyBindings.FirstOrDefault(x => x.DisplayName == w.WidgetName);
-				b.Bindings = w.Text;
+				b.Bindings = w.Bindings;
 			}
 		}
 
@@ -139,7 +139,7 @@ namespace BizHawk.Client.EmuHawk
 			foreach (var w in InputWidgets)
 			{
 				var b = Global.Config.HotkeyBindings.FirstOrDefault(x => x.DisplayName == w.WidgetName);
-				if (b != null) w.Text = b.DefaultBinding;
+				if (b != null) w.Bindings = b.DefaultBinding;
 			}
 		}