diff --git a/ChangeLog b/ChangeLog
index b6782a4d0..5c6f1e167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-18  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSDocument.m (runModalSavePanel:withAccessoryView:): Only
+	set accessory view when not nil. Workaround for bug #19031.
+
 2007-02-16  Richard Frith-Macdoanld <rfm@gnu.org>
 
 	* Source/NSMenuItemCell.m: fixup glitch with drawing of horizontal
diff --git a/Source/NSDocument.m b/Source/NSDocument.m
index 953b88397..f6877f6a3 100644
--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@@ -943,7 +943,10 @@ originalContentsURL: (NSURL *)orig
 - (int)runModalSavePanel: (NSSavePanel *)savePanel 
        withAccessoryView: (NSView *)accessoryView
 {
-  [savePanel setAccessoryView: accessoryView];
+  if (accessoryView)
+    {
+      [savePanel setAccessoryView: accessoryView];
+    }
   return [savePanel runModal];
 }