diff --git a/ChangeLog b/ChangeLog
index 8049d52887..a2653d5ff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmodules.c (_gtk_modules_init): Set 
+	default_display_opened before loading modules.  (#393102,
+	Brian Cameron)
+ 
 2007-01-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextview.c (gtk_text_view_set_border_window_size):
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 2a9f52019a..86496e0bf2 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -499,6 +499,7 @@ _gtk_modules_init (gint        *argc,
     }
 
   display_manager = gdk_display_manager_get ();
+  default_display_opened = gdk_display_get_default () != NULL;
   g_signal_connect (display_manager, "notify::default-display",
 		    G_CALLBACK (default_display_notify_cb), 
 		    NULL);