diff --git a/ChangeLog b/ChangeLog
index 19d97bcb83..a152c36801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
 
-	* app/display/gimpdisplayshell-scale.c
+	* app/display/gimpdisplayshell-scroll.c
+	(gimp_display_shell_setup_hscrollbar_with_value): Consistency
+	cleanup.
+
+2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/display/gimpdisplayshell-scale.[ch]
 	(gimp_display_shell_center_image): New function.
 	(gimp_display_shell_scale_fill)
 	(gimp_display_shell_scale_fit_in): Center the image at the end.
diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c
index 4f3e147d0e..4dba83a1fb 100644
--- a/app/display/gimpdisplayshell-scroll.c
+++ b/app/display/gimpdisplayshell-scroll.c
@@ -378,11 +378,11 @@ gimp_display_shell_setup_hscrollbar_with_value (GimpDisplayShell *shell,
 
   if (shell->disp_width < sw)
     {
-      shell->hsbdata->upper = MAX (value + shell->disp_width,
-                                   sw);
-
       shell->hsbdata->lower = MIN (value,
                                    0);
+
+      shell->hsbdata->upper = MAX (value + shell->disp_width,
+                                   sw);
     }
   else
     {
@@ -418,11 +418,11 @@ gimp_display_shell_setup_vscrollbar_with_value (GimpDisplayShell *shell,
 
   if (shell->disp_height < sh)
     {
-      shell->vsbdata->upper = MAX (value + shell->disp_height,
-                                   sh);
-
       shell->vsbdata->lower = MIN (value,
                                    0);
+
+      shell->vsbdata->upper = MAX (value + shell->disp_height,
+                                   sh);
     }
   else
     {