diff --git a/ChangeLog b/ChangeLog
index ef563533dd..8f59f21c40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_init):
+	Fully initialize the root window, fixes bug #501583.
+
 2007-12-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtknotebook.c: Modify the tab-label-destroy fix to not
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index d128f2c32f..a5e2274a62 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -834,6 +834,7 @@ _gdk_windowing_window_init (void)
 {
   GdkWindowObject *private;
   GdkWindowImplQuartz *impl;
+  GdkDrawableImplQuartz *drawable_impl;
   NSRect rect;
 
   g_assert (_gdk_root == NULL);
@@ -851,6 +852,12 @@ _gdk_windowing_window_init (void)
   private->state = 0; /* We don't want GDK_WINDOW_STATE_WITHDRAWN here */
   private->window_type = GDK_WINDOW_ROOT;
   private->depth = 24;
+
+  drawable_impl = GDK_DRAWABLE_IMPL_QUARTZ (private->impl);
+  
+  drawable_impl->wrapper = GDK_DRAWABLE (private);
+  drawable_impl->colormap = gdk_screen_get_system_colormap (_gdk_screen);
+  g_object_ref (drawable_impl->colormap);
 }
 
 void