diff --git a/Source/NSOpenPanel.m b/Source/NSOpenPanel.m
index 8396045e8..fc0508c2b 100644
--- a/Source/NSOpenPanel.m
+++ b/Source/NSOpenPanel.m
@@ -359,14 +359,6 @@ static NSOpenPanel *_gs_gui_open_panel = nil;
 
   if (_canChooseDirectories == NO)
     {
-      BOOL isDir;
-      NSString *file = [path stringByAppendingPathComponent: name];
-      
-      if (([[NSFileManager defaultManager] fileExistsAtPath: file
-					   isDirectory: &isDir] == NO) 
-	  || isDir)
-	[_okButton setEnabled: NO];
-
       if([_browser allowsMultipleSelection] == YES)
 	[_browser setAllowsBranchSelection:NO];
     }
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index e14350903..65e3bb52f 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -697,6 +697,10 @@ static BOOL _gs_display_reading_progress = NO;
    */
   _OKButtonPressed = NO;
 
+  [self browser: _browser
+	selectCellWithString: [[_browser selectedCell] stringValue] 
+	inColumn: [_browser selectedColumn]];
+
   [NSApp runModalForWindow: self];
 
   if (_OKButtonPressed)