diff --git a/BizHawk.Client.Common/tools/RamSearchEngine/Enums.cs b/BizHawk.Client.Common/tools/RamSearchEngine/Enums.cs
index 851d79ef7b..1a52dcd48a 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine/Enums.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine/Enums.cs
@@ -9,4 +9,9 @@
 	{
 		Previous, SpecificValue, SpecificAddress, Changes, Difference
 	}
+
+	public enum SearchMode
+	{
+		Fast, Detailed
+	}
 }
diff --git a/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
index 2f1631591c..c4e8dec7ea 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
@@ -62,7 +62,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 			{
 				default:
 				case WatchSize.Byte:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						for (int i = 0; i < domain.Size; i++)
 						{
@@ -79,7 +79,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 					break;
 				case WatchSize.Word:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						for (int i = 0; i < domain.Size - 1; i += _settings.CheckMisAligned ? 1 : 2)
 						{
@@ -96,7 +96,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 					break;
 				case WatchSize.DWord:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						for (int i = 0; i < domain.Size - 3; i += _settings.CheckMisAligned ? 1 : 4)
 						{
@@ -122,7 +122,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 		{
 			get
 			{
-				if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+				if (_settings.Mode == SearchMode.Detailed)
 				{
 					return Watch.GenerateWatch(
 						_settings.Domain,
@@ -194,7 +194,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 		public int Count => _watchList.Count;
 
-		public SearchEngineSettings.SearchMode Mode => _settings.Mode;
+		public SearchMode Mode => _settings.Mode;
 
 		public MemoryDomain Domain => _settings.Domain;
 
@@ -225,7 +225,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 		public void Update()
 		{
-			if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+			if (_settings.Mode == SearchMode.Detailed)
 			{
 				foreach (IMiniWatchDetails watch in _watchList)
 				{
@@ -247,7 +247,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 		/// <exception cref="InvalidOperationException"><see cref="Mode"/> is <see cref="Settings.SearchMode.Fast"/> and <paramref name="type"/> is <see cref="PreviousType.LastFrame"/></exception>
 		public void SetPreviousType(PreviousType type)
 		{
-			if (_settings.Mode == SearchEngineSettings.SearchMode.Fast)
+			if (_settings.Mode == SearchMode.Fast)
 			{
 				if (type == PreviousType.LastFrame)
 				{
@@ -265,7 +265,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 		public void ClearChangeCounts()
 		{
-			if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+			if (_settings.Mode == SearchMode.Detailed)
 			{
 				foreach (var watch in _watchList.Cast<IMiniWatchDetails>())
 				{
@@ -311,7 +311,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 			{
 				default:
 				case WatchSize.Byte:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						foreach (var addr in addresses)
 						{
@@ -328,7 +328,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 					break;
 				case WatchSize.Word:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						foreach (var addr in addresses)
 						{
@@ -345,7 +345,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 					break;
 				case WatchSize.DWord:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						foreach (var addr in addresses)
 						{
@@ -394,7 +394,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 					break;
 				case WatchList.CHANGES:
-					if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+					if (_settings.Mode == SearchMode.Detailed)
 					{
 						if (reverse)
 						{
@@ -611,7 +611,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
 
 		private IEnumerable<IMiniWatch> CompareChanges(IEnumerable<IMiniWatch> watchList)
 		{
-			if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed && CompareValue.HasValue)
+			if (_settings.Mode == SearchMode.Detailed && CompareValue.HasValue)
 			{
 				var compareValue = CompareValue.Value;
 				switch (Operator)
@@ -760,8 +760,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
 		{
 			return _settings.Mode switch
 			{
-				SearchEngineSettings.SearchMode.Detailed => true,
-				SearchEngineSettings.SearchMode.Fast => (compareType != Compare.Changes),
+				SearchMode.Detailed => true,
+				SearchMode.Fast => (compareType != Compare.Changes),
 				_ => true
 			};
 		}
diff --git a/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs b/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs
index b4d8ed2ace..1ecb262460 100644
--- a/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs
+++ b/BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs
@@ -19,11 +19,6 @@ namespace BizHawk.Client.Common.RamSearchEngine
 		}
 
 		/*Require restart*/
-		public enum SearchMode
-		{
-			Fast, Detailed
-		}
-
 		public SearchMode Mode { get; set; }
 		public MemoryDomain Domain { get; set; }
 		public WatchSize Size { get; set; }
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index 67354926d9..a3923f5f30 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -150,7 +150,7 @@ namespace BizHawk.Client.EmuHawk
 
 			_dropdownDontfire = false;
 
-			if (_settings.Mode == SearchEngineSettings.SearchMode.Fast)
+			if (_settings.Mode == SearchMode.Fast)
 			{
 				SetToFastMode();
 			}
@@ -606,9 +606,9 @@ namespace BizHawk.Client.EmuHawk
 		private void DoDomainSizeCheck()
 		{
 			if (_settings.Domain.Size >= MaxDetailedSize
-				&& _settings.Mode == SearchEngineSettings.SearchMode.Detailed)
+				&& _settings.Mode == SearchMode.Detailed)
 			{
-				_settings.Mode = SearchEngineSettings.SearchMode.Fast;
+				_settings.Mode = SearchMode.Fast;
 				SetReboot(true);
 				MessageLabel.Text = "Large domain, switching to fast mode";
 			}
@@ -768,7 +768,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SetToDetailedMode()
 		{
-			_settings.Mode = SearchEngineSettings.SearchMode.Detailed;
+			_settings.Mode = SearchMode.Detailed;
 			NumberOfChangesRadio.Enabled = true;
 			NumberOfChangesBox.Enabled = true;
 			DifferenceRadio.Enabled = true;
@@ -797,7 +797,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SetToFastMode()
 		{
-			_settings.Mode = SearchEngineSettings.SearchMode.Fast;
+			_settings.Mode = SearchMode.Fast;
 
 			if (_settings.PreviousType == PreviousType.LastFrame || _settings.PreviousType == PreviousType.LastChange)
 			{
@@ -1074,8 +1074,8 @@ namespace BizHawk.Client.EmuHawk
 
 		private void ModeSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
-			DetailedMenuItem.Checked = _settings.Mode == SearchEngineSettings.SearchMode.Detailed;
-			FastMenuItem.Checked = _settings.Mode == SearchEngineSettings.SearchMode.Fast;
+			DetailedMenuItem.Checked = _settings.Mode == SearchMode.Detailed;
+			FastMenuItem.Checked = _settings.Mode == SearchMode.Fast;
 		}
 
 		private void MemoryDomainsSubMenu_DropDownOpened(object sender, EventArgs e)
@@ -1152,8 +1152,8 @@ namespace BizHawk.Client.EmuHawk
 					break;
 			}
 
-			PreviousFrameMenuItem.Enabled = _settings.Mode != SearchEngineSettings.SearchMode.Fast;
-			Previous_LastChangeMenuItem.Enabled = _settings.Mode != SearchEngineSettings.SearchMode.Fast;
+			PreviousFrameMenuItem.Enabled = _settings.Mode != SearchMode.Fast;
+			Previous_LastChangeMenuItem.Enabled = _settings.Mode != SearchMode.Fast;
 		}
 
 		private void DetailedMenuItem_Click(object sender, EventArgs e)
@@ -1219,7 +1219,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void SearchSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
-			ClearChangeCountsMenuItem.Enabled = _settings.Mode == SearchEngineSettings.SearchMode.Detailed;
+			ClearChangeCountsMenuItem.Enabled = _settings.Mode == SearchMode.Detailed;
 
 			RemoveMenuItem.Enabled =
 				AddToRamWatchMenuItem.Enabled =
@@ -1411,7 +1411,7 @@ namespace BizHawk.Client.EmuHawk
 			RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
 
 			_settings = new SearchEngineSettings(MemoryDomains);
-			if (_settings.Mode == SearchEngineSettings.SearchMode.Fast)
+			if (_settings.Mode == SearchMode.Fast)
 			{
 				SetToFastMode();
 			}