diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 2adc46a38f..463a18a7e2 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -764,8 +764,9 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			var sysName = Global.Emulator.DisplayName();
+			var sysId = Global.Emulator.SystemId;
 			return !attr.UnsupportedCores.Contains(sysName) // not unsupported
-				&& (!attr.SupportedSystems.Any() || attr.SupportedSystems.Contains(sysName)); // supported (no supported list -> assumed all supported)
+				&& (attr.SupportedSystems.Contains(sysId) || attr.SupportedSystems.Contains(sysName)); // supported (no supported list -> assumed all supported)
 		}
 
 		public bool IsAvailable<T>() => IsAvailable(typeof(T));