diff --git a/ChangeLog b/ChangeLog
index 87256ef30d..2a8037e92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/display/gimpdisplayshell-scroll.c
+	(gimp_display_shell_setup_hscrollbar_with_value)
+	(gimp_display_shell_setup_vscrollbar_with_value): Use
+	gimp_display_shell_get_scaled_image_size() instead of inaccurately
+	calculate that information locally.
+
 2008-07-13  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/display/gimpnavigationeditor.c
diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c
index 7fca68b647..4f3e147d0e 100644
--- a/app/display/gimpdisplayshell-scroll.c
+++ b/app/display/gimpdisplayshell-scroll.c
@@ -374,7 +374,7 @@ gimp_display_shell_setup_hscrollbar_with_value (GimpDisplayShell *shell,
       ! shell->display->image)
     return;
 
-  sw = SCALEX (shell, gimp_image_get_width (shell->display->image));
+  gimp_display_shell_get_scaled_image_size (shell, &sw, NULL);
 
   if (shell->disp_width < sw)
     {
@@ -414,7 +414,7 @@ gimp_display_shell_setup_vscrollbar_with_value (GimpDisplayShell *shell,
       ! shell->display->image)
     return;
 
-  sh = SCALEY (shell, gimp_image_get_height (shell->display->image));
+  gimp_display_shell_get_scaled_image_size (shell, NULL, &sh);
 
   if (shell->disp_height < sh)
     {