diff --git a/ChangeLog b/ChangeLog
index 6bffc9723d..190ded13a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpimagedock.c (gimp_image_dock_image_changed):
+	don't use the image container as display container.
+
 2005-04-13  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimpdatafactory.[ch]: added gimp_data_factory_refresh().
diff --git a/app/widgets/gimpimagedock.c b/app/widgets/gimpimagedock.c
index 5e52691558..27a524cd8e 100644
--- a/app/widgets/gimpimagedock.c
+++ b/app/widgets/gimpimagedock.c
@@ -586,12 +586,14 @@ gimp_image_dock_image_changed (GimpContext *context,
 			       GimpImage   *gimage,
 			       GimpDock    *dock)
 {
-  GimpImageDock *image_dock = GIMP_IMAGE_DOCK (dock);
-  GimpContainer *container  = image_dock->image_container;
+  GimpImageDock *image_dock        = GIMP_IMAGE_DOCK (dock);
+  GimpContainer *image_container   = image_dock->image_container;
+  GimpContainer *display_container = image_dock->display_container;
 
-  if (gimage == NULL && ! gimp_container_is_empty (container))
+  if (gimage == NULL && ! gimp_container_is_empty (image_container))
     {
-      gimage = GIMP_IMAGE (gimp_container_get_child_by_index (container, 0));
+      gimage = GIMP_IMAGE (gimp_container_get_child_by_index (image_container,
+                                                              0));
 
       if (gimage)
 	{
@@ -606,7 +608,7 @@ gimp_image_dock_image_changed (GimpContext *context,
 	  g_signal_stop_emission_by_name (context, "image_changed");
 	}
     }
-  else if (gimage != NULL && ! gimp_container_is_empty (container))
+  else if (gimage != NULL && ! gimp_container_is_empty (display_container))
     {
       GimpObject *gdisp;
       GimpImage  *gdisp_gimage;
@@ -631,7 +633,7 @@ gimp_image_dock_image_changed (GimpContext *context,
         {
           GList *list;
 
-          for (list = GIMP_LIST (container)->list;
+          for (list = GIMP_LIST (display_container)->list;
                list;
                list = g_list_next (list))
             {
diff --git a/app/widgets/gimpmenudock.c b/app/widgets/gimpmenudock.c
index 5e52691558..27a524cd8e 100644
--- a/app/widgets/gimpmenudock.c
+++ b/app/widgets/gimpmenudock.c
@@ -586,12 +586,14 @@ gimp_image_dock_image_changed (GimpContext *context,
 			       GimpImage   *gimage,
 			       GimpDock    *dock)
 {
-  GimpImageDock *image_dock = GIMP_IMAGE_DOCK (dock);
-  GimpContainer *container  = image_dock->image_container;
+  GimpImageDock *image_dock        = GIMP_IMAGE_DOCK (dock);
+  GimpContainer *image_container   = image_dock->image_container;
+  GimpContainer *display_container = image_dock->display_container;
 
-  if (gimage == NULL && ! gimp_container_is_empty (container))
+  if (gimage == NULL && ! gimp_container_is_empty (image_container))
     {
-      gimage = GIMP_IMAGE (gimp_container_get_child_by_index (container, 0));
+      gimage = GIMP_IMAGE (gimp_container_get_child_by_index (image_container,
+                                                              0));
 
       if (gimage)
 	{
@@ -606,7 +608,7 @@ gimp_image_dock_image_changed (GimpContext *context,
 	  g_signal_stop_emission_by_name (context, "image_changed");
 	}
     }
-  else if (gimage != NULL && ! gimp_container_is_empty (container))
+  else if (gimage != NULL && ! gimp_container_is_empty (display_container))
     {
       GimpObject *gdisp;
       GimpImage  *gdisp_gimage;
@@ -631,7 +633,7 @@ gimp_image_dock_image_changed (GimpContext *context,
         {
           GList *list;
 
-          for (list = GIMP_LIST (container)->list;
+          for (list = GIMP_LIST (display_container)->list;
                list;
                list = g_list_next (list))
             {