diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 90b4184553..1b1d0ba5fc 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -338,11 +338,14 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		public void UpdateValues<T>() where T : IToolForm
 		{
-			CloseIfDisposed<T>();
 			var tool = _tools.FirstOrDefault(x => x is T);
 			if (tool != null)
 			{
-				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();
+				}
 			}
 		}
 
@@ -385,7 +388,6 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		public void Restart<T>() where T : IToolForm
 		{
-			CloseIfDisposed<T>();
 			var tool = _tools.FirstOrDefault(x => x is T);
 			if (tool != null)
 			{
@@ -475,15 +477,6 @@ namespace BizHawk.Client.EmuHawk
 			return tool;
 		}
 
-		private void CloseIfDisposed<T>() where T : IToolForm
-		{
-			var existingTool = _tools.FirstOrDefault(x => x is T);
-			if (existingTool != null && existingTool.IsDisposed)
-			{
-				Close<T>();
-			}
-		}
-
 		public void UpdateToolsBefore(bool fromLua = false)
 		{
 			if (Has<LuaConsole>())