diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index 9b0b33e549..666fd46b75 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -429,7 +429,6 @@ namespace BizHawk.MultiClient
 
 		private void InitializeAddress(Watch w)
 		{
-			w.Domain = Domain;
 			w.PeekAddress();
 			w.Prev = w.Value;
 			w.Original = w.Value;
diff --git a/BizHawk.MultiClient/tools/WatchCommon.cs b/BizHawk.MultiClient/tools/WatchCommon.cs
index 7594ed87f4..8d28a15d7d 100644
--- a/BizHawk.MultiClient/tools/WatchCommon.cs
+++ b/BizHawk.MultiClient/tools/WatchCommon.cs
@@ -160,9 +160,12 @@ namespace BizHawk.MultiClient
 					{
 						y = s.IndexOf('\t') + 1;
 						s = s.Substring(y, s.Length - y);   //Domain
+						temp = s.Substring(0, s.IndexOf('\t'));
+						w.Domain = Global.Emulator.MemoryDomains[GetDomainPos(temp)];
 					}
 
-					w.Notes = s.Substring(2, s.Length - 2);   //User notes
+					y = s.IndexOf('\t') + 1;
+					w.Notes = s.Substring(y, s.Length - y);   //User notes
 
 					watchList.Add(w);
 				}