diff --git a/ChangeLog b/ChangeLog
index 1fa6754b0..0eafd4721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* sources/gtk-sharp-sources.xml: Invalid XML due to unremoved -->
 	closing comment tag.
 
+2004-10-29  Todd Berman  <tberman@off.net>
+
+	* gtk/FileChooserDialog.custom: Allow a null parent.
+
 2004-10-29  Todd Berman  <tberman@off.net>
 
 	* gconf/GConf/gconf-sharp-2.0.pc.in: s/PACKAGE/PACKAGE_VERSION/ to fix 
diff --git a/gtk/FileChooserDialog.custom b/gtk/FileChooserDialog.custom
index 59fe31b2c..aaa438975 100644
--- a/gtk/FileChooserDialog.custom
+++ b/gtk/FileChooserDialog.custom
@@ -3,7 +3,7 @@
 
 		public FileChooserDialog (string title, Window parent, FileChooserAction action)
 		{
-			Raw = gtk_file_chooser_dialog_new (title, parent.Handle, (int)action, IntPtr.Zero);
+			Raw = gtk_file_chooser_dialog_new (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, IntPtr.Zero);
 		}
 		
 		[DllImport("libgtk-win32-2.0-0.dll")]
@@ -11,5 +11,5 @@
 		
 		public FileChooserDialog (string title, Window parent, FileChooserAction action, string backend)
 		{
-			Raw = gtk_file_chooser_dialog_new_with_backend (title, parent.Handle, (int)action, backend, IntPtr.Zero);
+			Raw = gtk_file_chooser_dialog_new_with_backend (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, backend, IntPtr.Zero);
 		}