diff --git a/ChangeLog b/ChangeLog
index ce97389f3d..8e41697117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-23  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpdisplayshell-callbacks.c
+	(gimp_display_shell_canvas_expose): return TRUE after calling
+	gimp_display_shell_canvas_expose_image().
+
 2008-03-23  Sven Neumann  <sven@gimp.org>
 
 	* app/dialogs/dialogs.c
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 838c58149f..d34c7079f3 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -353,13 +353,21 @@ gimp_display_shell_canvas_expose (GtkWidget        *widget,
   if (shell->display->image)
     {
       gimp_display_shell_canvas_expose_image (shell, eevent);
+
+      /* Return TRUE here to avoid redrawing the image when it gets the
+       * keyboard focus.
+       */
+      return TRUE;
     }
   else
     {
       gimp_display_shell_canvas_expose_drop_zone (shell, eevent);
-    }
 
-  return FALSE;
+      /* Return FALSE here so that the drag indicator is drawn around
+       * the empty canvas during DND operations.
+       */
+      return FALSE;
+    }
 }
 
 static void