diff --git a/ChangeLog b/ChangeLog
index 8aecf2fee..45078c982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-02  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSSavePanel.m (-_resetDefaults): Set directory only
+	if nil (otherwise keep the current directory).
+
 2001-11-02  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/gnustep/gui/NSSlider.h
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index 7bdbe4742..ee5f81490 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -280,7 +280,8 @@ static BOOL _gs_display_reading_progress = NO;
 
 - (void) _resetDefaults
 {
-  ASSIGN (_directory, [_fm currentDirectoryPath]);
+  if (_directory == nil)
+    ASSIGN (_directory, [_fm currentDirectoryPath]);
   [self setPrompt: @"Name:"];
   [self setTitle: @"Save"];
   [self setRequiredFileType: @""];