diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
index 3823a2d81b..f59904b2f1 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
@@ -97,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public override bool AskSaveChanges()
 		{
-			if (_unsavedZones.Count == 0 || IsDisposed)
+			if (_unsavedZones.Count == 0)
 			{
 				return true;
 			}
diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index a0b1d49498..028e77953e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -616,9 +616,7 @@ namespace BizHawk.Client.EmuHawk
 				return true;
 			}
 
-			return _tools
-				.Select(tool => tool.AskSaveChanges())
-				.All(result => result);
+			return _tools.TrueForAll(tool => !tool.IsActive || tool.AskSaveChanges());
 		}
 
 		/// <summary>