diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 8a2d024fab..82134abc53 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -931,10 +931,12 @@
 		<MenuItem id = "SaveAs"
 		          label = "${res:OpenFileTabEventHandler.ContextMenu.SaveAs}"
 		          class = "ICSharpCode.SharpDevelop.Commands.TabStrip.SaveFileAsTab"/>
-		<MenuItem id = "SaveAll"
+		<Condition name = "OpenWindowState" openwindowstate="Dirty" action="Disable">
+			<MenuItem id = "SaveAll"
 		          icon = "Icons.16x16.SaveAllIcon"
 		          label = "${res:XML.MainMenu.FileMenu.SaveAll.Description}"
 		          class = "ICSharpCode.SharpDevelop.Commands.SaveAllFiles"/>
+		</Condition>
 		<MenuItem id = "SaveSeparator" type = "Separator" />
 		<ComplexCondition action="Disable">
 			<Not>
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateEvaluator.cs
index 3f60422a36..ef4e604d43 100644
--- a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateEvaluator.cs
+++ b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/OpenWindowStateEvaluator.cs
@@ -66,8 +66,8 @@ namespace ICSharpCode.Core
 				return false;
 			}
 			
-			windowState   = condition.Properties.Get("windowstate", WindowState.None);
-			nowindowState = condition.Properties.Get("nowindowstate", WindowState.None);
+			windowState   = condition.Properties.Get("openwindowstate", WindowState.None);
+			nowindowState = condition.Properties.Get("noopenwindowstate", WindowState.None);
 		
 			
 			foreach (IViewContent view in WorkbenchSingleton.Workbench.ViewContentCollection) {