diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 60923cc3c2..109b6602c1 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
 		/// </summary>
 		public bool Has<T>() where T : IToolForm
 		{
-			return _tools.Any(x => x is T);
+			return _tools.Any(x => x is T && !x.IsDisposed);
 		}
 
 		/// <summary>