diff --git a/src/BizHawk.Client.Common/tools/CheatList.cs b/src/BizHawk.Client.Common/tools/CheatList.cs
index ff740184b5..1434a10ff5 100644
--- a/src/BizHawk.Client.Common/tools/CheatList.cs
+++ b/src/BizHawk.Client.Common/tools/CheatList.cs
@@ -310,21 +310,18 @@ namespace BizHawk.Client.Common
 
 		public void SaveOnClose()
 		{
-			if (Global.Config.CheatsAutoSaveOnClose)
+			if (Changes && _cheatList.Any())
 			{
-				if (Changes && _cheatList.Any())
+				if (string.IsNullOrWhiteSpace(CurrentFileName))
 				{
-					if (string.IsNullOrWhiteSpace(CurrentFileName))
-					{
-						CurrentFileName = _defaultFileName;
-					}
+					CurrentFileName = _defaultFileName;
+				}
 
-					SaveFile(CurrentFileName);
-				}
-				else if (!_cheatList.Any() && !string.IsNullOrWhiteSpace(CurrentFileName))
-				{
-					new FileInfo(CurrentFileName).Delete();
-				}
+				SaveFile(CurrentFileName);
+			}
+			else if (!_cheatList.Any() && !string.IsNullOrWhiteSpace(CurrentFileName))
+			{
+				new FileInfo(CurrentFileName).Delete();
 			}
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 355f54b922..36049601df 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3891,7 +3891,11 @@ namespace BizHawk.Client.EmuHawk
 				Tools.Get<TraceLogger>().Restart();
 			}
 
-			CheatList.SaveOnClose();
+			if (Config.CheatsAutoSaveOnClose)
+			{
+				CheatList.SaveOnClose();
+			}
+
 			Emulator.Dispose();
 			Emulator = new NullEmulator();
 			ClientApi.UpdateEmulatorAndVP(Emulator);