diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
index daaff8ba9d..15a17f0a8b 100644
--- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
@@ -189,6 +189,7 @@
 			// 
 			this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
 			this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1";
+			this.addToRamWatchToolStripMenuItem1.ShortcutKeyDisplayString = "A";
 			this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(199, 22);
 			this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch";
 			this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click);
@@ -205,6 +206,7 @@
 			// 
 			this.unfreezeAllToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze;
 			this.unfreezeAllToolStripMenuItem.Name = "unfreezeAllToolStripMenuItem";
+			this.unfreezeAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Delete)));
 			this.unfreezeAllToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
 			this.unfreezeAllToolStripMenuItem.Text = "Unfreeze All";
 			this.unfreezeAllToolStripMenuItem.Click += new System.EventHandler(this.unfreezeAllToolStripMenuItem_Click);
@@ -258,14 +260,14 @@
             this.incrementToolStripMenuItem,
             this.decrementToolStripMenuItem});
 			this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip";
-			this.ViewerContextMenuStrip.Size = new System.Drawing.Size(175, 164);
+			this.ViewerContextMenuStrip.Size = new System.Drawing.Size(194, 142);
 			this.ViewerContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.ViewerContextMenuStrip_Opening);
 			// 
 			// pokeToolStripMenuItem
 			// 
 			this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
 			this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem";
-			this.pokeToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.pokeToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
 			this.pokeToolStripMenuItem.Text = "&Poke";
 			this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click);
 			// 
@@ -273,7 +275,8 @@
 			// 
 			this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
 			this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem";
-			this.freezeToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.freezeToolStripMenuItem.ShortcutKeyDisplayString = "Space";
+			this.freezeToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
 			this.freezeToolStripMenuItem.Text = "&Freeze";
 			this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click);
 			// 
@@ -281,7 +284,8 @@
 			// 
 			this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
 			this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem";
-			this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.addToRamWatchToolStripMenuItem.ShortcutKeyDisplayString = "A";
+			this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
 			this.addToRamWatchToolStripMenuItem.Text = "&Add to Ram Watch";
 			this.addToRamWatchToolStripMenuItem.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click);
 			// 
@@ -289,20 +293,21 @@
 			// 
 			this.unfreezeAllToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Unfreeze;
 			this.unfreezeAllToolStripMenuItem1.Name = "unfreezeAllToolStripMenuItem1";
-			this.unfreezeAllToolStripMenuItem1.Size = new System.Drawing.Size(174, 22);
+			this.unfreezeAllToolStripMenuItem1.ShortcutKeyDisplayString = "Shift+Del";
+			this.unfreezeAllToolStripMenuItem1.Size = new System.Drawing.Size(193, 22);
 			this.unfreezeAllToolStripMenuItem1.Text = "&Unfreeze All";
 			this.unfreezeAllToolStripMenuItem1.Click += new System.EventHandler(this.unfreezeAllToolStripMenuItem1_Click);
 			// 
 			// toolStripSeparator4
 			// 
 			this.toolStripSeparator4.Name = "toolStripSeparator4";
-			this.toolStripSeparator4.Size = new System.Drawing.Size(171, 6);
+			this.toolStripSeparator4.Size = new System.Drawing.Size(190, 6);
 			// 
 			// incrementToolStripMenuItem
 			// 
 			this.incrementToolStripMenuItem.Name = "incrementToolStripMenuItem";
 			this.incrementToolStripMenuItem.ShortcutKeyDisplayString = "+";
-			this.incrementToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.incrementToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
 			this.incrementToolStripMenuItem.Text = "&Increment";
 			this.incrementToolStripMenuItem.Click += new System.EventHandler(this.incrementToolStripMenuItem_Click);
 			// 
@@ -310,7 +315,7 @@
 			// 
 			this.decrementToolStripMenuItem.Name = "decrementToolStripMenuItem";
 			this.decrementToolStripMenuItem.ShortcutKeyDisplayString = "-";
-			this.decrementToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
+			this.decrementToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
 			this.decrementToolStripMenuItem.Text = "&Decrement";
 			this.decrementToolStripMenuItem.Click += new System.EventHandler(this.decrementToolStripMenuItem_Click);
 			// 
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 740184cc3c..e9fac56986 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -955,6 +955,15 @@ namespace BizHawk.MultiClient
 				case Keys.Space:
 					ToggleFreeze();
 					break;
+				case Keys.Delete:
+					if (e.Modifiers == Keys.Shift)
+						RemoveAllCheats();
+					else
+						UnFreezeAddress();
+					break;
+				case Keys.A:
+					AddToRamWatch();
+					break;
 			}
 		}