diff --git a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.Designer.cs
index 0232504ff4..bbcc130a64 100644
--- a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.Designer.cs
@@ -75,6 +75,7 @@
 			this.propertyGrid1.Size = new System.Drawing.Size(306, 299);
 			this.propertyGrid1.TabIndex = 0;
 			this.propertyGrid1.ToolbarVisible = false;
+			this.propertyGrid1.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid1_PropertyValueChanged);
 			// 
 			// tabPage2
 			// 
diff --git a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
index 9adacfe74c..e391210149 100644
--- a/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
@@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk
 		object s;
 		object ss;
 		bool syncsettingschanged = false;
+		bool settingschanged = false;
 
 		GenericCoreConfig(bool ignoresettings, bool ignoresyncsettings)
 		{
@@ -49,10 +50,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void button1_Click(object sender, EventArgs e)
 		{
-			var settable = new SettingsAdapter(Global.Emulator);
-			if (s != null && settable.HasSettings)
+			if (s != null && settingschanged)
 			{
-				settable.PutSettings(s);
+				GlobalWin.MainForm.PutCoreSettings(s);
 			}
 
 			if (ss != null && syncsettingschanged)
@@ -100,5 +100,10 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 		}
+
+		private void propertyGrid1_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
+		{
+			settingschanged = true;
+		}
 	}
 }