diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index a759065364..ac9cc92cd9 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -254,6 +254,7 @@ namespace BizHawk.MultiClient
             RamSearch1.Restart();
             HexEditor1.Restart();
             NESPPU1.Restart();
+            Cheats1.Restart();
 			Text = "BizHawk";
             HandlePlatformMenus();
 		}
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 1281a1ce8f..d6c3f67977 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -534,6 +534,7 @@ namespace BizHawk.MultiClient
 				RamSearch1.Restart();
 				HexEditor1.Restart();
                 NESPPU1.Restart();
+                Cheats1.Restart();
 				CurrentlyOpenRom = path;
                 HandlePlatformMenus();
 				return true;
diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index df4174efbc..276a28daa4 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -13,12 +13,10 @@ namespace BizHawk.MultiClient
 {
     public partial class Cheats : Form
     {
-        //Open/Close rom should start a new cheat list
         //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
-        //Save & Load Domain name into .wch file
 
         int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
         int defaultHeight;
@@ -41,6 +39,21 @@ namespace BizHawk.MultiClient
             return c;
         }
 
+        private void ClearFields()
+        {
+            NameBox.Text = "";
+            AddressBox.Text = "";
+            ValueBox.Text = "";
+            PopulateMemoryDomainComboBox();
+            AddressBox.MaxLength = GetNumDigits(Global.Emulator.MainMemory.Size - 1);
+        }
+
+        public void Restart()
+        {
+            NewCheatList();
+            ClearFields();
+        }
+
         public Cheats()
         {
             InitializeComponent();
@@ -113,6 +126,7 @@ namespace BizHawk.MultiClient
 
         private void PopulateMemoryDomainComboBox()
         {
+            DomainComboBox.Items.Clear();
             if (Global.Emulator.MemoryDomains.Count > 0)
             {
                 for (int x = 0; x < Global.Emulator.MemoryDomains.Count; x++)