diff --git a/BizHawk.Client.Common/tools/CheatList.cs b/BizHawk.Client.Common/tools/CheatList.cs
index 54fcbb9ddc..07431e1db7 100644
--- a/BizHawk.Client.Common/tools/CheatList.cs
+++ b/BizHawk.Client.Common/tools/CheatList.cs
@@ -707,6 +707,11 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public void SetDefaultFileName(string defaultFileName)
+		{
+			_defaultFileName = defaultFileName;
+		}
+
 		private void CheatChanged(object sender)
 		{
 			if (Changed != null)
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 890f896e00..ffa6d18c9b 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3486,10 +3486,15 @@ namespace BizHawk.Client.EmuHawk
 
 					if (Global.Config.LoadCheatFileByGame)
 					{
+						Global.CheatList.SetDefaultFileName(ToolManager.GenerateDefaultCheatFilename());
 						if (Global.CheatList.AttemptToLoadCheatFile())
 						{
 							GlobalWin.OSD.AddMessage("Cheats file loaded");
 						}
+						else if (Global.CheatList.Any())
+						{
+							Global.CheatList.Clear();
+						}
 					}
 
 					SetWindowText();