diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 45f8260fea..29fcad4c4e 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1653,14 +1653,14 @@ namespace BizHawk.Client.EmuHawk
 
 		private void NesControllerSettingsMenuItem_Click(object sender, EventArgs e)
 		{
-			if (Emulator is NES)
+			if (Emulator is NES nes)
 			{
-				using var form = new NesControllerSettings();
+				using var form = new NesControllerSettings(this, nes.GetSyncSettings().Clone());
 				form.ShowDialog();
 			}
-			else if (Emulator is SubNESHawk)
+			else if (Emulator is SubNESHawk sub)
 			{
-				using var form = new NesControllerSettings();
+				using var form = new NesControllerSettings(this, sub.GetSyncSettings().Clone());
 				form.ShowDialog();
 			}
 			else if (Emulator is QuickNES)
diff --git a/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs b/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
index 3debf50624..744a0dbdce 100644
--- a/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
+++ b/BizHawk.Client.EmuHawk/config/NES/NESSyncSettingsForm.cs
@@ -6,7 +6,6 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
-using BizHawk.Common.NumberExtensions;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs b/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs
index 4141bf067e..8c11455e12 100644
--- a/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs
+++ b/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs
@@ -1,29 +1,22 @@
 using System;
 using System.Linq;
 using System.Windows.Forms;
-
-using BizHawk.Client.Common;
 using BizHawk.Emulation.Cores.Nintendo.NES;
-using BizHawk.Emulation.Cores.Nintendo.SubNESHawk;
 
 namespace BizHawk.Client.EmuHawk
 {
 	public partial class NesControllerSettings : Form
 	{
+		private readonly MainForm _mainForm;
 		private readonly NES.NESSyncSettings _syncSettings;
 
-		public NesControllerSettings()
+		public NesControllerSettings(
+			MainForm mainForm,
+			NES.NESSyncSettings syncSettings)
 		{
+			_mainForm = mainForm;
+			_syncSettings = syncSettings;
 			InitializeComponent();
-			if (Global.Emulator is NES)
-			{
-				_syncSettings = ((NES)Global.Emulator).GetSyncSettings();
-			}
-			else
-			{
-				_syncSettings = ((SubNESHawk)Global.Emulator).GetSyncSettings();
-			}
-			
 
 			// TODO: use combobox extension and add descriptions to enum values
 			comboBoxFamicom.Items.AddRange(NESControlSettings.GetFamicomExpansionValues().ToArray());
@@ -45,7 +38,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void OkBtn_Click(object sender, EventArgs e)
 		{
-			var ctrls = new NESControlSettings
+			var controls = new NESControlSettings
 			{
 				Famicom = checkBoxFamicom.Checked,
 				FamicomExpPort = (string)comboBoxFamicom.SelectedItem,
@@ -53,13 +46,13 @@ namespace BizHawk.Client.EmuHawk
 				NesRightPort = (string)comboBoxNESR.SelectedItem
 			};
 
-			bool changed = NESControlSettings.NeedsReboot(ctrls, _syncSettings.Controls);
+			bool changed = NESControlSettings.NeedsReboot(controls, _syncSettings.Controls);
 
-			_syncSettings.Controls = ctrls;
+			_syncSettings.Controls = controls;
 
 			if (changed)
 			{
-				GlobalWin.MainForm.PutCoreSyncSettings(_syncSettings);
+				_mainForm.PutCoreSyncSettings(_syncSettings);
 			}
 
 			DialogResult = DialogResult.OK;
@@ -68,7 +61,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void CancelBtn_Click(object sender, EventArgs e)
 		{
-			GlobalWin.OSD.AddMessage("Controller settings aborted");
+			_mainForm.AddOnScreenMessage("Controller settings aborted");
 			DialogResult = DialogResult.Cancel;
 			Close();
 		}