diff --git a/ChangeLog b/ChangeLog
index fe07d0d171..dc329d5770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-24  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpcontainertreeview.c
+	(gimp_container_tree_view_select_item): put back the hack which
+	calls gtk_tree_selection_select_iter() in addition to
+	gtk_tree_view_set_cursor() until bug #115871 is fixed.
+
 2003-06-24  Sven Neumann  <sven@gimp.org>
 
         Added persistent storage of text layers in XCF files. We use a 
diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c
index 2c1eb57333..eaf2387682 100644
--- a/app/widgets/gimpcontainertreeview.c
+++ b/app/widgets/gimpcontainertreeview.c
@@ -550,9 +550,11 @@ gimp_container_tree_view_select_item (GimpContainerView *view,
 
       gtk_tree_view_set_cursor (tree_view->view, path, NULL, FALSE);
 
-#if 0
-      gtk_tree_selection_select_iter (tree_view->selection, iter);
+#ifdef __GNUC__
+#warning FIXME: remove this hack as soon as #115871 is fixed
 #endif
+      /*  gtk_tree_view_set_cursor() should be sufficient actually...  */
+      gtk_tree_selection_select_iter (tree_view->selection, iter);
 
       g_signal_handlers_unblock_by_func (tree_view->selection,
 					 gimp_container_tree_view_selection_changed,