diff --git a/BizHawk.Client.EmuHawk/config/InputWidget.cs b/BizHawk.Client.EmuHawk/config/InputWidget.cs
index e42d2eb260..8491ae4a17 100644
--- a/BizHawk.Client.EmuHawk/config/InputWidget.cs
+++ b/BizHawk.Client.EmuHawk/config/InputWidget.cs
@@ -117,6 +117,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			ClearBindings();
 			Text = string.Empty;
+			_tooltip1.SetToolTip(this, string.Empty);
 		}
 
 		/// <summary>
@@ -245,6 +246,7 @@ namespace BizHawk.Client.EmuHawk
 		public void UpdateLabel()
 		{
 			Text = string.Join(",", _bindings.Where(str => !string.IsNullOrWhiteSpace(str)));
+			_tooltip1.SetToolTip(this, Text);
 		}
 
 		protected override void OnKeyPress(KeyPressEventArgs e)