diff --git a/ChangeLog b/ChangeLog
index a76344ff1f..5cc05e99eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-20  Michael Natterer  <mitch@gimp.org>
+
+	* app/gui/gui-vtable.c (gui_display_create): add back code that
+	made sure the newly created display/image combo is the user
+	context's active one.
+
 2008-03-20  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/display/gimpdisplayshell-close.c
diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
index 16ee7358bc..3b06a26c16 100644
--- a/app/gui/gui-vtable.c
+++ b/app/gui/gui-vtable.c
@@ -303,7 +303,15 @@ gui_display_create (Gimp      *gimp,
                                   image_managers->data);
    }
 
-  gimp_context_set_display (context, display);
+  if (gimp_context_get_display (context) == display)
+    {
+      gimp_context_set_image (context, image);
+      gimp_context_display_changed (context);
+    }
+  else
+    {
+      gimp_context_set_display (context, display);
+    }
 
   gimp_ui_manager_update (GIMP_DISPLAY_SHELL (display->shell)->menubar_manager,
                           display);