diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 69f2ef04c5..3c0ba7b3ce 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -2302,7 +2302,7 @@
 			this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem";
 			this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
 			this.GBcoreSettingsToolStripMenuItem.Text = "Settings...";
-			this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBcoreSettingsToolStripMenuItem_Click);
+			this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBCoreSettingsMenuItem_Click);
 			// 
 			// LoadGBInSGBMenuItem
 			// 
@@ -2593,7 +2593,7 @@
 			this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
 			this.settingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
 			this.settingsToolStripMenuItem.Text = "&Settings...";
-			this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
+			this.settingsToolStripMenuItem.Click += new System.EventHandler(this.WondersawnSettingsMenuItem_Click);
 			// 
 			// HelpSubMenu
 			// 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 5543facafa..cb1b284dd2 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -911,6 +911,18 @@ namespace BizHawk.Client.EmuHawk
 			new EmuHawkOptions().ShowDialog();
 		}
 
+		private void ProfilesMenuItem_Click(object sender, EventArgs e)
+		{
+			if (new ProfileConfig().ShowDialog() == DialogResult.OK)
+			{
+				GlobalWin.OSD.AddMessage("Profile settings saved");
+			}
+			else
+			{
+				GlobalWin.OSD.AddMessage("Profile config aborted");
+			}
+		}
+
 		private void ClickThrottleMenuItem_Click(object sender, EventArgs e)
 		{
 			Global.Config.ClockThrottle ^= true;
@@ -1567,6 +1579,11 @@ namespace BizHawk.Client.EmuHawk
 			LoadGBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
 		}
 
+		private void GBCoreSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			config.GB.GBPrefs.DoGBPrefsDialog(this);
+		}
+
 		private void GBForceDMGMenuItem_Click(object sender, EventArgs e)
 		{
 			var s = (Gameboy.GambatteSyncSettings)Global.Emulator.GetSyncSettings();
@@ -1828,6 +1845,15 @@ namespace BizHawk.Client.EmuHawk
 
 		#endregion
 
+		#region Wondersawn
+
+		private void WondersawnSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			GenericCoreConfig.DoDialog(this, "WonderSwan Settings");
+		}
+
+		#endregion
+
 		#region Help
 
 		private void OnlineHelpMenuItem_Click(object sender, EventArgs e)
@@ -2153,6 +2179,14 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void ProfileFirstBootLabel_Click(object sender, EventArgs e)
+		{
+			var profileForm = new ProfileConfig();
+			profileForm.ShowDialog();
+			Global.Config.FirstBoot = false;
+			ProfileFirstBootLabel.Visible = false;
+		}
+
 		#endregion
 
 		#region Form Events
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index babc40ab7a..c766cdfc00 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3335,36 +3335,6 @@ namespace BizHawk.Client.EmuHawk
 
 		#endregion
 
-		private void GBcoreSettingsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			config.GB.GBPrefs.DoGBPrefsDialog(this);
-		}
-
-		private void settingsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GenericCoreConfig.DoDialog(this, "WonderSwan Settings");
-		}
-
-		private void ProfilesMenuItem_Click(object sender, EventArgs e)
-		{
-			if (new ProfileConfig().ShowDialog() == DialogResult.OK)
-			{
-				GlobalWin.OSD.AddMessage("Profile settings saved");
-			}
-			else
-			{
-				GlobalWin.OSD.AddMessage("Profile config aborted");
-			}
-		}
-
-		private void ProfileFirstBootLabel_Click(object sender, EventArgs e)
-		{
-			var profileForm = new ProfileConfig();
-			profileForm.ShowDialog();
-			Global.Config.FirstBoot = false;
-			ProfileFirstBootLabel.Visible = false;
-		}
-
 		// TODO: move me
 		private IControlMainform _master;
 		public void RelinquishControl(IControlMainform master)