diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs
index 546ec7db7c..49faa333e5 100644
--- a/BizHawk.Client.Common/tools/CheatList.cs
+++ b/BizHawk.Client.Common/tools/CheatList.cs
@@ -21,7 +21,10 @@ namespace BizHawk.Client.Common
 			set
 			{
 				_changes = value;
-				CheatChanged(Cheat.Separator); //Pass a dummy, no cheat invoked this change
+				if (value)
+				{
+					CheatChanged(Cheat.Separator); //Pass a dummy, no cheat invoked this change
+				}
 			}
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
index e2a9538680..0e1ce3cbcc 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatForm.cs
@@ -205,16 +205,6 @@ namespace BizHawk.Client.EmuHawk
 			UpdateValues();
 		}
 
-		protected override void OnClosing(CancelEventArgs e)
-		{
-			if (!Global.Config.CheatsAutoSaveOnClose)
-			{
-				if (!AskSave())
-					e.Cancel = true;
-			}
-			base.OnClosing(e);
-		}
-
 		private void ToggleGameGenieButton()
 		{
 			GameGenieToolbarSeparator.Visible =