diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 2eb35aae3b..48f69035db 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -305,7 +305,7 @@ gimp_display_shell_canvas_draw (GtkWidget        *widget,
         {
           gimp_display_shell_canvas_draw_image (shell, cr);
         }
-      else
+      else if (image == NULL)
         {
           gimp_display_shell_canvas_draw_drop_zone (shell, cr);
         }