diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index c7379ffe54..7b8e08d75e 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -952,9 +952,14 @@ namespace BizHawk.Client.EmuHawk
 			using var controller = new ControllerConfig(Emulator, Global.Config);
 			if (controller.ShowDialog() == DialogResult.OK)
 			{
+				AddOnScreenMessage("Controller settings saved");
 				InitControls();
 				InputManager.SyncControls();
 			}
+			else
+			{
+				AddOnScreenMessage("Controller config aborted");
+			}
 		}
 
 		private void HotkeysMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index 53dc8d794b..18414b76d5 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -53,11 +53,6 @@ namespace BizHawk.Client.EmuHawk
 			ControllerImages.Add("MAME Controller", Properties.Resources.ArcadeController);			
 		}
 
-		private ControllerConfig()
-		{
-			InitializeComponent();
-		}
-
 		protected override void OnActivated(EventArgs e)
 		{
 			base.OnActivated(e);
@@ -209,10 +204,12 @@ namespace BizHawk.Client.EmuHawk
 		public ControllerConfig(
 			IEmulator emulator,
 			Config config)
-			: this()
 		{
 			_emulator = emulator;
 			_config = config;
+			
+			InitializeComponent();
+
 			SuspendLayout();
 			LoadPanels(_config);
 
@@ -362,14 +359,12 @@ namespace BizHawk.Client.EmuHawk
 
 			Save();
 
-			GlobalWin.OSD.AddMessage("Controller settings saved");
 			DialogResult = DialogResult.OK;
 			Close();
 		}
 
 		private void ButtonCancel_Click(object sender, EventArgs e)
 		{
-			GlobalWin.OSD.AddMessage("Controller config aborted");
 			Close();
 		}