diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 2891bf4e8a..3f9e6dd4f1 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -614,6 +614,7 @@ gimp_display_shell_canvas_draw_image (GimpDisplayShell *shell,
   gimp_canvas_item_draw (shell->unrotated_item, cr);
 
   /* restart (and recalculate) the selection boundaries */
+  gimp_display_shell_selection_draw (shell, cr);
   gimp_display_shell_selection_restart (shell);
 }
 
diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c
index a28202441e..da11f5ad7e 100644
--- a/app/display/gimpdisplayshell-selection.c
+++ b/app/display/gimpdisplayshell-selection.c
@@ -412,12 +412,6 @@ selection_generate_segs (Selection *selection)
                          &selection->n_segs_in, &selection->n_segs_out,
                          0, 0, 0, 0);
 
-  if (selection->n_segs_in || selection->n_segs_out)
-    gtk_widget_translate_coordinates (GTK_WIDGET (selection->shell->canvas),
-                                      GTK_WIDGET (selection->shell),
-                                      0, 0,
-                                      &canvas_offset_x, &canvas_offset_y);
-
   if (selection->n_segs_in)
     {
       selection->segs_in = g_new (GimpSegment, selection->n_segs_in);
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 998500e874..87f6be027e 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -151,8 +151,6 @@ static void      gimp_display_shell_unmap          (GtkWidget        *widget);
 static void      gimp_display_shell_screen_changed (GtkWidget        *widget,
                                                     GdkScreen        *previous);
 static gboolean  gimp_display_shell_popup_menu     (GtkWidget        *widget);
-static gboolean  gimp_display_shell_draw           (GtkWidget        *widget,
-                                                    cairo_t          *cr);
 
 static void      gimp_display_shell_real_scaled    (GimpDisplayShell *shell);
 static void      gimp_display_shell_real_scrolled  (GimpDisplayShell *shell);
@@ -244,7 +242,6 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass)
   widget_class->unmap              = gimp_display_shell_unmap;
   widget_class->screen_changed     = gimp_display_shell_screen_changed;
   widget_class->popup_menu         = gimp_display_shell_popup_menu;
-  widget_class->draw               = gimp_display_shell_draw;
 
   klass->scaled                    = gimp_display_shell_real_scaled;
   klass->scrolled                  = gimp_display_shell_real_scrolled;
@@ -974,20 +971,6 @@ gimp_display_shell_popup_menu (GtkWidget *widget)
   return TRUE;
 }
 
-static gboolean
-gimp_display_shell_draw (GtkWidget *widget,
-                         cairo_t   *cr)
-{
-  GtkWidgetClass   *widget_class = g_type_class_peek_parent (parent_class);
-  GimpDisplayShell *shell        = GIMP_DISPLAY_SHELL (widget);
-  gboolean          stop_handlers;
-
-  stop_handlers = widget_class->draw (widget, cr);
-  gimp_display_shell_selection_draw (shell, cr);
-
-  return stop_handlers;
-}
-
 static void
 gimp_display_shell_real_scaled (GimpDisplayShell *shell)
 {