diff --git a/ChangeLog b/ChangeLog
index ea3de07989..48acd9dc07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
 
 2008-08-26  Martin Nordholts  <martinn@svn.gnome.org>
 
-	* app/display/gimpdisplayshell-scroll.c
+	* app/display/gimpdisplayshell-scroll.[ch]
 	(gimp_display_shell_scroll_unoverscrollify): New function.
 
 	* app/display/gimpdisplayshell-autoscroll.c
diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c
index d93e3d59ad..de54b66956 100644
--- a/app/display/gimpdisplayshell-scroll.c
+++ b/app/display/gimpdisplayshell-scroll.c
@@ -310,7 +310,7 @@ gimp_display_shell_scroll_unoverscrollify (GimpDisplayShell *shell,
     }
   else if (in_offset_y > 0)
     {
-      gint min_offset = sh - shell->disp_width;
+      gint min_offset = sh - shell->disp_height;
 
       *out_offset_y = MIN (in_offset_y,
                            MAX (0, min_offset - shell->offset_y));