diff --git a/lcl/interfaces/gtk2/gtk2globals.pp b/lcl/interfaces/gtk2/gtk2globals.pp
index aec584fea6..b81d641be5 100644
--- a/lcl/interfaces/gtk2/gtk2globals.pp
+++ b/lcl/interfaces/gtk2/gtk2globals.pp
@@ -73,19 +73,6 @@ var
 
 var
   Styles : TStrings;
-
-const
-  //(bsNone, bsSingle, bsSizeable, bsDialog, bsToolWindow, bsSizeToolWin);
-  GtkWindowTypeHints: array[TFormBorderStyle] of TGdkWindowTypeHint = (
-    GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-    GDK_WINDOW_TYPE_HINT_NORMAL,
-    GDK_WINDOW_TYPE_HINT_NORMAL,
-    GDK_WINDOW_TYPE_HINT_DIALOG,
-    GDK_WINDOW_TYPE_HINT_UTILITY,
-    GDK_WINDOW_TYPE_HINT_UTILITY
-    );
-
-var
   DefaultPangoLayout: PPangoLayout = nil;
 
 const
diff --git a/lcl/interfaces/gtk2/gtk2wsforms.pp b/lcl/interfaces/gtk2/gtk2wsforms.pp
index 885bc71ff5..d2c8c3e0bb 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,7 @@ 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(GtkWindow, GDK_WINDOW_TYPE_HINT_DIALOG);
     GtkWindowShowModal(AForm, GtkWindow);
   end else
   begin