diff --git a/ChangeLog b/ChangeLog
index 6dd2dc01b2..6df44b78b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-23  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpcontainergridview.c: use GtkAdjustment's accessors.
+
 2009-03-23  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimpcontainerbox.c: use accessors instead of
diff --git a/app/widgets/gimpcontainergridview.c b/app/widgets/gimpcontainergridview.c
index 53b2e715e2..13dd25fafa 100644
--- a/app/widgets/gimpcontainergridview.c
+++ b/app/widgets/gimpcontainergridview.c
@@ -631,14 +631,16 @@ gimp_container_grid_view_highlight_item (GimpContainerView *container_view,
 
       row = index / grid_view->columns;
 
-      if (row * item_height < adj->value)
+      if (row * item_height < gtk_adjustment_get_value (adj))
         {
           gtk_adjustment_set_value (adj, row * item_height);
         }
-      else if ((row + 1) * item_height > adj->value + adj->page_size)
+      else if ((row + 1) * item_height > (gtk_adjustment_get_value (adj) +
+                                          gtk_adjustment_get_page_size (adj)))
         {
           gtk_adjustment_set_value (adj,
-                                    (row + 1) * item_height - adj->page_size);
+                                    (row + 1) * item_height -
+                                    gtk_adjustment_get_page_size (adj));
         }
 
       gimp_view_renderer_set_border_type (view->renderer,