diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 71a1c061dc..5c0a821e73 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -365,10 +365,6 @@ gimp_display_shell_init (GimpDisplayShell *shell)
 
   shell->last_active_state      = 0;
 
-
-  gtk_window_set_role (GTK_WINDOW (shell), "gimp-image-window");
-  gtk_window_set_resizable (GTK_WINDOW (shell), TRUE);
-
   gtk_widget_set_events (GTK_WIDGET (shell), (GDK_POINTER_MOTION_MASK      |
                                               GDK_POINTER_MOTION_HINT_MASK |
                                               GDK_BUTTON_PRESS_MASK        |
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 3759b815a3..4343e7d409 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -131,6 +131,8 @@ gimp_image_window_class_init (GimpImageWindowClass *klass)
 static void
 gimp_image_window_init (GimpImageWindow *window)
 {
+  gtk_window_set_role (GTK_WINDOW (window), "gimp-image-window");
+  gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
 }
 
 static GObject *