Index: Source/NSDocument.m
===================================================================
--- Source/NSDocument.m	(Revision 24754)
+++ Source/NSDocument.m	(Arbeitskopie)
@@ -1035,6 +1035,7 @@
   NSDocumentController *controller;
   NSSavePanel *savePanel = [NSSavePanel savePanel];
 
+  ASSIGN(_save_type, [self fileType]);
   controller = [NSDocumentController sharedDocumentController];
   displayNames = [controller _displayNamesForClass: [self class]];
   
@@ -1051,7 +1052,7 @@
   if ([displayNames count] > 0)
     {
       NSArray  *extensions = [[NSDocumentController sharedDocumentController] 
-			       fileExtensionsFromType: [self fileTypeFromLastRunSavePanel]];
+			       fileExtensionsFromType: [self fileType]];
       if ([extensions count] > 0)
 	{
 	  [savePanel setRequiredFileType:[extensions objectAtIndex:0]];