diff --git a/ChangeLog b/ChangeLog
index d1f7ef81f0..9981ad0d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-14  Martin Nordholts  <martinn@svn.gnome.org>
+
+	* app/display/gimpdisplayshell-handlers.c
+	(gimp_display_shell_monitor_res_notify_handler): When the screen
+	resolution changes and we are not in Dot by dot, we also need to
+	clamp the display shell offsets.
+
 2008-08-14  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/display/gimpdisplayshell-handlers.c
diff --git a/app/display/gimpdisplayshell-handlers.c b/app/display/gimpdisplayshell-handlers.c
index f4e1a02bc2..afe5b8b011 100644
--- a/app/display/gimpdisplayshell-handlers.c
+++ b/app/display/gimpdisplayshell-handlers.c
@@ -629,7 +629,8 @@ gimp_display_shell_monitor_res_notify_handler (GObject          *config,
 
   if (! shell->dot_for_dot)
     {
-      gimp_display_shell_update_scrollbars_and_rulers (shell);
+      gimp_display_shell_scroll_clamp_and_update (shell);
+
       gimp_display_shell_scaled (shell);
 
       gimp_display_shell_expose_full (shell);