diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 3b4bfc07a8..1555e4aa6d 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -882,6 +882,10 @@ gdk_window_new (GdkWindow     *parent,
       private->redirect = private->parent->redirect;
     }
     
+  gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
+				  (attributes->cursor) :
+				  NULL));
+
   return window;
 }
 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index b3b68466b3..4cec6457fe 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -763,10 +763,6 @@ _gdk_window_impl_new (GdkWindow     *window,
   g_object_ref (window);
   _gdk_xid_table_insert (screen_x11->display, &draw_impl->xid, window);
 
-  gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
-				  (attributes->cursor) :
-				  NULL));
-  
   switch (GDK_WINDOW_TYPE (private))
     {
     case GDK_WINDOW_DIALOG: