diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 7627bf5948..e785b48a5f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -1855,7 +1855,7 @@
 			this.QuicknesCoreMenuItem.Name = "QuicknesCoreMenuItem";
 			this.QuicknesCoreMenuItem.Size = new System.Drawing.Size(209, 22);
 			this.QuicknesCoreMenuItem.Text = "QuickNES";
-			this.QuicknesCoreMenuItem.Click += new System.EventHandler(this.NesCorePick_Click);
+			this.QuicknesCoreMenuItem.Click += new System.EventHandler(this.QuickNesCorePick_Click);
 			// 
 			// NesCoreMenuItem
 			// 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 58b8b23263..f4fa6c6002 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1211,9 +1211,20 @@ namespace BizHawk.Client.EmuHawk
 			SubNesHawkMenuItem.Checked = Config.UseSubNESHawk;
 		}
 
+		private void QuickNesCorePick_Click(object sender, EventArgs e)
+		{
+			Config.NES_InQuickNES = true;
+			Config.UseSubNESHawk = false;
+
+			if (Emulator.SystemId == "NES")
+			{
+				FlagNeedsReboot();
+			}
+		}
+
 		private void NesCorePick_Click(object sender, EventArgs e)
 		{
-			Config.NES_InQuickNES ^= true;
+			Config.NES_InQuickNES = false;
 			Config.UseSubNESHawk = false;
 
 			if (Emulator.SystemId == "NES")