diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas
index d2edc3fbf3..a8fefb24f9 100644
--- a/lcl/interfaces/qt/qtwidgets.pas
+++ b/lcl/interfaces/qt/qtwidgets.pas
@@ -18094,6 +18094,9 @@ begin
   FNeedRestoreVisible := False;
   if AParams.WndParent <> 0 then
     Parent := TQtWidget(AParams.WndParent).GetContainerWidget
+  else
+  if QApplication_activeModalWidget <> nil then
+    Parent := QApplication_activeModalWidget
   else
     Parent := nil;
   Result := QWidget_create(Parent, QtToolTip);
diff --git a/lcl/interfaces/qt/qtwsforms.pp b/lcl/interfaces/qt/qtwsforms.pp
index 4e4b43dad4..edbbc28912 100644
--- a/lcl/interfaces/qt/qtwsforms.pp
+++ b/lcl/interfaces/qt/qtwsforms.pp
@@ -1044,12 +1044,6 @@ begin
   AWidget := TQtHintWindow(AWinControl.Handle);
 
   AWidget.BeginUpdate;
-
-  if AWinControl.HandleObjectShouldBeVisible then
-  begin
-    if QApplication_activeModalWidget <> nil then
-      QWidget_setWindowModality(AWidget.Widget, QtWindowModal);
-  end;
   AWidget.setVisible(AWinControl.HandleObjectShouldBeVisible);
   AWidget.EndUpdate;
 end;