diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
index 264d842fc3..e33b7b9a1b 100644
--- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
+++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs
@@ -145,26 +145,6 @@ namespace BizHawk.Client.EmuHawk
 			GameGenieCode.Text = new NESGameGenieEncoder(_address.Value, _value.Value, _compare).Encode();
 		}
 
-		private void AddCheatClick()
-		{
-			if (!string.IsNullOrWhiteSpace(AddressBox.Text) && !string.IsNullOrWhiteSpace(ValueBox.Text))
-			{
-				var watch = Watch.GenerateWatch(
-					Global.Emulator.MemoryDomains["System Bus"],
-					AddressBox.ToRawInt().Value,
-					Watch.WatchSize.Byte,
-					Watch.DisplayType.Hex,
-					GameGenieCode.Text,
-					false);
-
-				Global.CheatList.Add(new Cheat(
-					watch,
-					ValueBox.ToRawInt().Value,
-					CompareBox.ToRawInt()
-				));
-			}
-		}
-
 		private void RefreshFloatingWindowControl()
 		{
 			Owner = Global.Config.NesGGSettings.FloatingWindow ? null : GlobalWin.MainForm;
@@ -242,7 +222,22 @@ namespace BizHawk.Client.EmuHawk
 
 		private void AddCheat_Click(object sender, EventArgs e)
 		{
-			AddCheatClick();
+			if (!string.IsNullOrWhiteSpace(AddressBox.Text) && !string.IsNullOrWhiteSpace(ValueBox.Text))
+			{
+				var watch = Watch.GenerateWatch(
+					Global.Emulator.MemoryDomains["System Bus"],
+					AddressBox.ToRawInt().Value,
+					Watch.WatchSize.Byte,
+					Watch.DisplayType.Hex,
+					GameGenieCode.Text,
+					false);
+
+				Global.CheatList.Add(new Cheat(
+					watch,
+					ValueBox.ToRawInt().Value,
+					CompareBox.ToRawInt()
+				));
+			}
 		}
 
 		private void GameGenieCode_KeyDown(object sender, KeyEventArgs e)
@@ -251,7 +246,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				if (AddCheat.Enabled)
 				{
-					AddCheatClick();
+					AddCheat_Click(null, null);
 				}
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 594d5470cb..2cc8882d95 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -102,7 +102,11 @@ namespace BizHawk.Client.EmuHawk
 			var afterList = _tools.Where(x => !x.UpdateBefore);
 			foreach (var tool in afterList.Where(tool => !tool.IsDisposed))
 			{
-				tool.UpdateValues();
+				if (!tool.IsDisposed ||
+					(tool is RamWatch && Global.Config.DisplayRamWatch)) // Ram Watch hack, on screen display should run even if Ram Watch is closed
+				{
+					tool.UpdateValues();
+				}
 			}
 		}