diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
index 9f82d4638b..c1427f8dcd 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
@@ -60,8 +60,8 @@ namespace BizHawk.Client.EmuHawk
 
 			AddressBox.SetHexProperties(_watchList[0].Domain.Size);
 			AddressBox.Text = _watchList.Select(a => a.AddressString).Distinct().Aggregate((addrStr, nextStr) => addrStr + ("," + nextStr));
-			ValueHexLabel.Text = _watchList[0].Type == Watch.DisplayType.Hex ? "0x" : String.Empty;
-			ValueBox.Text = _watchList[0].ValueString.Replace(" ", String.Empty);
+			ValueHexLabel.Text = _watchList[0].Type == Watch.DisplayType.Hex ? "0x" : string.Empty;
+			ValueBox.Text = _watchList[0].ValueString.Replace(" ", string.Empty);
 			DomainLabel.Text = _watchList[0].Domain.Name;
 			SizeLabel.Text = _watchList[0].Size.ToString();
 			DisplayTypeLabel.Text = Watch.DisplayTypeToString(_watchList[0].Type);
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index dc20acf8e3..67860558a3 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -724,10 +724,7 @@ namespace BizHawk.Client.EmuHawk
 					InitialLocation = GetPromptPoint()
 				};
 
-				if (SelectedWatches.Any())
-				{
-					poke.SetWatch(SelectedWatches);
-				}
+				poke.SetWatch(SelectedWatches);
 
 				if (poke.ShowHawkDialog() == DialogResult.OK)
 				{
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
index cbe518b3e8..f1fc1533e8 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
@@ -75,8 +75,8 @@ namespace BizHawk.Client.EmuHawk
 			get { return _type; }
 			set
 			{
-				int? val = ToRawInt();
 				_type = value;
+				int? val = ToRawInt();
 				SetMaxLength();
 				SetFromRawInt(val);
 			}