diff --git a/ChangeLog b/ChangeLog
index e5bf9bfa19..41b0e62929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-20  Sven Neumann  <sven@gimp.org>
+
+	* app/gui/gui.c (gui_restore_after_callback): create the empty
+	display before the other windows.
+
+	* app/display/gimpdisplayshell.c (gimp_display_shell_new): center
+	the empty window and create additional image windows under the
+	mouse cursor. Just an experiment ...
+
 2008-03-20  Sven Neumann  <sven@gimp.org>
 
 	* app/config/gimpguiconfig.c: changed default values for
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index f734f4342b..425b71badc 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -668,8 +668,10 @@ gimp_display_shell_new (GimpDisplay     *display,
 
   /*  the toplevel shell */
   shell = g_object_new (GIMP_TYPE_DISPLAY_SHELL,
-                     /* "gravity", GDK_GRAVITY_CENTER, */
-                        "unit",    unit,
+                        "window-position", (display->image ?
+                                            GTK_WIN_POS_MOUSE :
+                                            GTK_WIN_POS_CENTER),
+                        "unit",            unit,
                         NULL);
 
   shell->display = display;
diff --git a/app/gui/gui.c b/app/gui/gui.c
index a48b9103e7..30bb8dca68 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -525,15 +525,15 @@ gui_restore_after_callback (Gimp               *gimp,
 
   color_history_restore (gimp);
 
+  /*  create the empty display  */
+  gimp_create_display (gimp, NULL, GIMP_UNIT_PIXEL, 1.0);
+
+  gui_dbus_service_init (gimp);
+
   if (gui_config->restore_session)
     session_restore (gimp);
 
   dialogs_show_toolbox ();
-
-  gui_dbus_service_init (gimp);
-
-  /*  create the empty display  */
-  gimp_create_display (gimp, NULL, GIMP_UNIT_PIXEL, 1.0);
 }
 
 static gboolean