diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs
index 33514eaaad..44278d696e 100644
--- a/BizHawk.MultiClient/tools/Cheats.Designer.cs
+++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs
@@ -120,6 +120,7 @@
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
             this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
             this.fileToolStripMenuItem.Text = "&File";
+            this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened);
             // 
             // newToolStripMenuItem
             // 
diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index 276a28daa4..7b9ff8275c 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -15,7 +15,6 @@ namespace BizHawk.MultiClient
     {
         //Implement Options menu settings
         //Implement Freeze functions in all memory domains
-        //Save - implement (should default to SaveAs if no cheats file)
         //Restore Window Size should restore column order as well
 
         int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
@@ -853,5 +852,22 @@ namespace BizHawk.MultiClient
             DisplayCheatsList();
             Changes();
         }
+
+        private void fileToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
+        {
+            if (Global.Config.AutoLoadCheats == true)
+                autoLoadToolStripMenuItem.Checked = true;
+            else
+                autoLoadToolStripMenuItem.Checked = false;
+
+            if (string.Compare(currentCheatFile, "") == 0 || !changes)
+            {
+                saveToolStripMenuItem.Enabled = false;
+            }
+            else
+            {
+                saveToolStripMenuItem.Enabled = true;
+            }
+        }
     }
 }