diff --git a/BizHawk.MultiClient/LuaImplementation.cs b/BizHawk.MultiClient/LuaImplementation.cs
index af194e815f..4473dcc3c5 100644
--- a/BizHawk.MultiClient/LuaImplementation.cs
+++ b/BizHawk.MultiClient/LuaImplementation.cs
@@ -1744,7 +1744,7 @@ namespace BizHawk.MultiClient
 
 		public void client_openramwatch()
 		{
-			Global.MainForm.LoadRamWatch();
+			Global.MainForm.LoadRamWatch(true);
 		}
 
 		public void client_openramsearch()
diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 897bc94919..a3ec1e531e 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -232,7 +232,7 @@ namespace BizHawk.MultiClient
 
 		private void RAMWatchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			LoadRamWatch();
+			LoadRamWatch(true);
 		}
 
 		private void rAMSearchToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index da2335367b..c15906cc76 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -249,7 +249,14 @@ namespace BizHawk.MultiClient
 
 			if (Global.Config.AutoLoadRamWatch)
 			{
-				LoadRamWatch();
+				if (Global.Config.DisplayRamWatch)
+				{
+					LoadRamWatch(false);
+				}
+				else
+				{
+					LoadRamWatch(true);
+				}
 			}
 			if (Global.Config.AutoLoadRamSearch)
 				LoadRamSearch();
@@ -920,7 +927,7 @@ namespace BizHawk.MultiClient
 			}
 			else if (Path.GetExtension(filePaths[0]).ToUpper() == ".WCH")
 			{
-				LoadRamWatch();
+				LoadRamWatch(true);
 				RamWatch1.LoadWatchFile(filePaths[0], false);
 				RamWatch1.DisplayWatchList();
 			}
@@ -1689,7 +1696,7 @@ namespace BizHawk.MultiClient
 				case "Load Named State": LoadStateAs(); break;
 				case "Previous Slot": PreviousSlot(); break;
 				case "Next Slot": NextSlot(); break;
-				case "Ram Watch": LoadRamWatch(); break;
+				case "Ram Watch": LoadRamWatch(true); break;
 				case "Ram Search": LoadRamSearch(); break;
 				case "Ram Poke":
 					{
@@ -2703,7 +2710,7 @@ namespace BizHawk.MultiClient
 				Global.OSD.AddMessage("Movie read+write mode");
 		}
 
-		public void LoadRamWatch()
+		public void LoadRamWatch(bool load_dialog)
 		{
 			if (!RamWatch1.IsHandleCreated || RamWatch1.IsDisposed)
 			{
@@ -2712,7 +2719,7 @@ namespace BizHawk.MultiClient
 				{
 					RamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches.GetRecentFileByPosition(0));
 				}
-				if (!Global.Config.DisplayRamWatch)
+				if (load_dialog)
 				{
 					RamWatch1.Show();
 				}
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 643bd7e51a..7b62625993 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -535,7 +535,7 @@ namespace BizHawk.MultiClient
 
 			if (address >= 0 || SecondaryHighlightedAddresses.Count > 0)
 			{
-				Global.MainForm.LoadRamWatch();
+				Global.MainForm.LoadRamWatch(true);
 			}
 
 			if (address >= 0)
diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index 9f61a0a379..3639a71288 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -302,9 +302,11 @@ namespace BizHawk.MultiClient
 
 			if (indexes.Count > 0)
 			{
-				Global.MainForm.LoadRamWatch();
+				Global.MainForm.LoadRamWatch(true);
 				for (int x = 0; x < indexes.Count; x++)
+				{
 					Global.MainForm.RamWatch1.AddWatch(searchList[indexes[x]]);
+				}
 			}
 		}
 
diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.MultiClient/tools/ToolBox.cs
index 3abfd04544..1d67e7d92f 100644
--- a/BizHawk.MultiClient/tools/ToolBox.cs
+++ b/BizHawk.MultiClient/tools/ToolBox.cs
@@ -75,7 +75,7 @@ namespace BizHawk.MultiClient
 
 		private void toolStripButton2_Click(object sender, EventArgs e)
 		{
-			Global.MainForm.LoadRamWatch();
+			Global.MainForm.LoadRamWatch(true);
 		}
 
 		private void toolStripButton3_Click(object sender, EventArgs e)