diff --git a/BizHawk.MultiClient/tools/Cheats/CheatForm.cs b/BizHawk.MultiClient/tools/Cheats/CheatForm.cs
index 9326545c84..0cd0e36fd5 100644
--- a/BizHawk.MultiClient/tools/Cheats/CheatForm.cs
+++ b/BizHawk.MultiClient/tools/Cheats/CheatForm.cs
@@ -751,6 +751,8 @@ namespace BizHawk.MultiClient
 			Global.Config.CheatsSaveWindowPosition = true;
 			Global.Config.CheatsAlwaysOnTop = TopMost = false;
 			Global.Config.DisableCheatsOnLoad = false;
+			Global.Config.LoadCheatFileByGame = true;
+			Global.Config.CheatsAutoSaveOnClose = true;
 
 			Global.Config.CheatsColumnIndices = new Dictionary<string, int>
 			{