diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
index b2d8e2e069..8e9da4406f 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.Designer.cs
@@ -32,7 +32,7 @@
 			this.NameLabel = new System.Windows.Forms.Label();
 			this.AddressLabel = new System.Windows.Forms.Label();
 			this.AddressHexIndLabel = new System.Windows.Forms.Label();
-			this.AddressBox = new HexTextBox();
+			this.AddressBox = new BizHawk.Client.EmuHawk.HexTextBox();
 			this.ValueHexIndLabel = new System.Windows.Forms.Label();
 			this.ValueLabel = new System.Windows.Forms.Label();
 			this.CompareHexIndLabel = new System.Windows.Forms.Label();
@@ -46,8 +46,8 @@
 			this.BigEndianCheckBox = new System.Windows.Forms.CheckBox();
 			this.AddButton = new System.Windows.Forms.Button();
 			this.EditButton = new System.Windows.Forms.Button();
-			this.CompareBox = new WatchValueBox();
-			this.ValueBox = new WatchValueBox();
+			this.CompareBox = new BizHawk.Client.EmuHawk.WatchValueBox();
+			this.ValueBox = new BizHawk.Client.EmuHawk.WatchValueBox();
 			this.SuspendLayout();
 			// 
 			// NameBox
@@ -239,7 +239,6 @@
 			this.CompareBox.Nullable = true;
 			this.CompareBox.Size = new System.Drawing.Size(65, 20);
 			this.CompareBox.TabIndex = 15;
-			this.CompareBox.Text = "00";
 			this.CompareBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex;
 			// 
 			// ValueBox
diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
index 381fd2fb2a..7a91835be4 100644
--- a/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
+++ b/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs
@@ -107,6 +107,7 @@ namespace BizHawk.Client.EmuHawk
 			SetTypeSelected(Watch.DisplayType.Hex);
 
 			CheckFormState();
+			CompareBox.Text = String.Empty; //TODO: A needed hack until WatchValueBox.ToRawInt() becomes nullable
 			_loading = false;
 		}