diff --git a/BizHawk.Client.Common/tools/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs
index 7c585f4f16..d4db093149 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine.cs
@@ -26,9 +26,9 @@ namespace BizHawk.Client.Common
 		private bool _keepHistory = true;
 		private bool _isSorted = true; // Tracks whether or not the list is sorted by address, if it is, binary search can be used for finding watches
 
-		public RamSearchEngine(Settings settings)
+		public RamSearchEngine(Settings settings, IMemoryDomains memoryDomains)
 		{
-			_settings = new Settings(Global.Emulator.AsMemoryDomains());
+			_settings = new Settings(memoryDomains);
 			_settings.Mode = settings.Mode;
 			_settings.Domain = settings.Domain;
 			_settings.Size = settings.Size;
@@ -38,8 +38,8 @@ namespace BizHawk.Client.Common
 			_settings.PreviousType = settings.PreviousType;
 		}
 
-		public RamSearchEngine(Settings settings, Compare compareTo, long? compareValue, int? differentBy)
-			: this(settings)
+		public RamSearchEngine(Settings settings, IMemoryDomains memoryDomains, Compare compareTo, long? compareValue, int? differentBy)
+			: this(settings, memoryDomains)
 			{
 				_compareTo = compareTo;
 				_differentBy = differentBy;
@@ -1182,6 +1182,7 @@ namespace BizHawk.Client.Common
 			public Settings(IMemoryDomains core)
 			{
 				BigEndian = core.MemoryDomains.MainMemory.EndianType == MemoryDomain.Endian.Big;
+				// TODO: Fetch this default from the IMemoryDomains object when that's implemented.
 				Size = (Watch.WatchSize)Global.SystemInfo.ByteSize;
 				Type = Watch.DisplayType.Unsigned;
 				Mode = core.MemoryDomains.MainMemory.Size > (1024 * 1024) ?
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index 4baec45684..a5dd1f6ada 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
 		private void RamSearch_Load(object sender, EventArgs e)
 		{
 			_settings = new RamSearchEngine.Settings(Core);
-			_searches = new RamSearchEngine(_settings);
+			_searches = new RamSearchEngine(_settings, Core);
 
 			ErrorIconButton.Visible = false;
 			_dropdownDontfire = true;
@@ -313,7 +313,7 @@ namespace BizHawk.Client.EmuHawk
 			var compareVal = _searches.CompareValue;
 			var differentBy = _searches.DifferentBy;
 
-			_searches = new RamSearchEngine(_settings, compareTo, compareVal, differentBy);
+			_searches = new RamSearchEngine(_settings, Core, compareTo, compareVal, differentBy);
 			_searches.Start();
 			if (Global.Config.RamSearchAlwaysExcludeRamWatch)
 			{