diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 93076622da..90b4184553 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -729,15 +729,16 @@ namespace BizHawk.Client.EmuHawk
 
 		public void LoadRamWatch(bool loadDialog)
 		{
-			if (Global.Emulator.HasMemoryDomains())
-			if (!IsLoaded<RamWatch>() && Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty)
+			Load<RamWatch>();
+
+			if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty)
 			{
-				GlobalWin.Tools.RamWatch.LoadFileFromRecent(Global.Config.RecentWatches.MostRecent);
+				RamWatch.LoadFileFromRecent(Global.Config.RecentWatches.MostRecent);
 			}
 
-			if (loadDialog)
+			if (!loadDialog)
 			{
-				GlobalWin.Tools.Load<RamWatch>();
+				Get<RamWatch>().Close();
 			}
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 28155daec8..f63866fd33 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -156,7 +156,7 @@ namespace BizHawk.Client.EmuHawk
 		public void LoadFileFromRecent(string path)
 		{
 			var ask_result = true;
-			if (_watches != null && _watches.Changes)
+			if (_watches.Changes)
 			{
 				ask_result = AskSaveChanges();
 			}