diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 56d4a98560..2a9d39d533 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1775,7 +1775,6 @@ namespace BizHawk.MultiClient
 		{
 			if (!Cheats1.IsHandleCreated || Cheats1.IsDisposed)
 			{
-				Cheats1 = new Cheats();
 				Cheats1.Show();
 			}
 			else
diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs
index a99ce374d3..3fde4aea01 100644
--- a/BizHawk.MultiClient/tools/Cheats.Designer.cs
+++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs
@@ -189,18 +189,18 @@
 			// noneToolStripMenuItem
 			// 
 			this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
-			this.noneToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.noneToolStripMenuItem.Size = new System.Drawing.Size(110, 22);
 			this.noneToolStripMenuItem.Text = "None";
 			// 
 			// toolStripSeparator4
 			// 
 			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator4.Size = new System.Drawing.Size(107, 6);
 			// 
 			// clearToolStripMenuItem
 			// 
 			this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
-			this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.clearToolStripMenuItem.Size = new System.Drawing.Size(110, 22);
 			this.clearToolStripMenuItem.Text = "Clear";
 			// 
 			// toolStripSeparator1
diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs
index 8348317361..57be949a2f 100644
--- a/BizHawk.MultiClient/tools/Cheats.cs
+++ b/BizHawk.MultiClient/tools/Cheats.cs
@@ -147,6 +147,8 @@ namespace BizHawk.MultiClient
 			LoadConfigSettings();
 			PopulateMemoryDomainComboBox();
 			AddressBox.MaxLength = GetNumDigits(Global.Emulator.MainMemory.Size - 1);
+			DisplayCheatsList();
+			CheatListView.Refresh();
 			UpdateNumberOfCheats();
 
 			//Hacky Disabling if not a supported core
@@ -185,6 +187,7 @@ namespace BizHawk.MultiClient
 		{
 			Changes();
 			cheatList.Add(c);
+			if (!this.IsHandleCreated || this.IsDisposed) return;
 			DisplayCheatsList();
 			CheatListView.Refresh();
 		}
diff --git a/BizHawk.MultiClient/tools/RamWatch.Designer.cs b/BizHawk.MultiClient/tools/RamWatch.Designer.cs
index 4dd46b33e4..ed27f93858 100644
--- a/BizHawk.MultiClient/tools/RamWatch.Designer.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.Designer.cs
@@ -197,24 +197,24 @@
 			// noneToolStripMenuItem
 			// 
 			this.noneToolStripMenuItem.Name = "noneToolStripMenuItem";
-			this.noneToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.noneToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
 			this.noneToolStripMenuItem.Text = "None";
 			// 
 			// toolStripSeparator4
 			// 
 			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator4.Size = new System.Drawing.Size(132, 6);
 			// 
 			// clearToolStripMenuItem
 			// 
 			this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
-			this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.clearToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
 			this.clearToolStripMenuItem.Text = "Clear";
 			// 
 			// autoLoadToolStripMenuItem
 			// 
 			this.autoLoadToolStripMenuItem.Name = "autoLoadToolStripMenuItem";
-			this.autoLoadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.autoLoadToolStripMenuItem.Size = new System.Drawing.Size(135, 22);
 			this.autoLoadToolStripMenuItem.Text = "Auto-Load";
 			// 
 			// toolStripSeparator1
@@ -616,6 +616,7 @@
 			this.toolStrip1.Name = "toolStrip1";
 			this.toolStrip1.Size = new System.Drawing.Size(364, 25);
 			this.toolStrip1.TabIndex = 2;
+			this.toolStrip1.TabStop = true;
 			this.toolStrip1.Text = "toolStrip1";
 			// 
 			// newToolStripButton
@@ -809,6 +810,7 @@
 			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
 			this.Text = "Ram Watch";
 			this.Load += new System.EventHandler(this.RamWatch_Load);
+			this.Enter += new System.EventHandler(this.RamWatch_Enter);
 			this.DragDrop += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragDrop);
 			this.DragEnter += new System.Windows.Forms.DragEventHandler(this.RamWatch_DragEnter);
 			this.menuStrip1.ResumeLayout(false);
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 5c47ce1b48..1d62f6a30c 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -1411,5 +1411,10 @@ namespace BizHawk.MultiClient
 		{
 			Global.Config.RamWatchSaveWindowPosition ^= true;
 		}
+
+		private void RamWatch_Enter(object sender, EventArgs e)
+		{
+			WatchListView.Focus();
+		}
 	}
 }
\ No newline at end of file