diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 9a382d2d11..c5d78eecc0 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -740,7 +740,7 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		private static readonly Lazy<List<string>> lazyAsmTypes = new Lazy<List<string>>(() =>
-			Assembly.ReflectionOnlyLoadFrom(Assembly.GetExecutingAssembly().Location)
+			Assembly.GetAssembly(typeof(ToolManager)) // Confining the search to only EmuHawk, for now at least, we may want to broaden for ApiHawk one day
 				.GetTypes()
 				.Select(t => t.AssemblyQualifiedName)
 				.ToList()