diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 1872dc8fca..448ede3a52 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1009,16 +1009,10 @@
 		<MenuItem id = "SaveAs"
 		          label = "${res:OpenFileTabEventHandler.ContextMenu.SaveAs}"
 		          class = "ICSharpCode.SharpDevelop.Commands.TabStrip.SaveFileAsTab"/>
-		<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>
-				<Condition name = "Ownerstate" ownerstate="FileUntitled" />
+				<Condition name = "Ownerstate" ownerstate="FileUntitled,ViewContentWithoutFile" />
 			</Not>
 			<MenuItem id = "CopyPathName"
 			          label = "${res:OpenFileTabEventHandler.CopyPathName}"
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
index 29fac481f0..63deff3e5b 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
@@ -79,7 +79,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 			Nothing             = 0,
 			FileDirty           = 1,
 			FileReadOnly        = 2,
-			FileUntitled        = 4
+			FileUntitled        = 4,
+			ViewContentWithoutFile = 8
 		}
 		
 		public System.Enum InternalState {
@@ -93,6 +94,8 @@ namespace ICSharpCode.SharpDevelop.Gui
 						state |= OpenFileTabStates.FileReadOnly;
 					if (content.PrimaryFile != null && content.PrimaryFile.IsUntitled)
 						state |= OpenFileTabStates.FileUntitled;
+					if (content.PrimaryFile == null)
+						state |= OpenFileTabStates.ViewContentWithoutFile;
 				}
 				return state;
 			}