diff --git a/lcl/interfaces/gtk2/gtk2wsforms.pp b/lcl/interfaces/gtk2/gtk2wsforms.pp
index 16774fecf0..ad3c7c7c14 100644
--- a/lcl/interfaces/gtk2/gtk2wsforms.pp
+++ b/lcl/interfaces/gtk2/gtk2wsforms.pp
@@ -725,8 +725,6 @@ begin
     if AForm.HandleObjectShouldBeVisible and
       GTK_IS_WINDOW({%H-}PGtkWindow(AForm.Handle)) then
       begin
-        gtk_window_set_type_hint({%H-}PGtkWindow(AForm.Handle),
-           GtkWindowTypeHints[AForm.BorderStyle]);
         gtk_window_set_keep_above({%H-}PGtkWindow(AForm.Handle),
           GBoolean(AForm.FormStyle in fsAllStayOnTop))
       end
@@ -741,6 +739,8 @@ begin
   begin
     gtk_window_set_default_size(GtkWindow, Max(1,AForm.Width), Max(1,AForm.Height));
     gtk_widget_set_uposition(PGtkWidget(GtkWindow), AForm.Left, AForm.Top);
+    gtk_window_set_type_hint({%H-}PGtkWindow(AForm.Handle),
+       GtkWindowTypeHints[AForm.BorderStyle]);
     GtkWindowShowModal(AForm, GtkWindow);
   end else
   begin