diff --git a/lcl/interfaces/qt/qtobject.inc b/lcl/interfaces/qt/qtobject.inc
index 7cb1d79b78..03433c67c0 100644
--- a/lcl/interfaces/qt/qtobject.inc
+++ b/lcl/interfaces/qt/qtobject.inc
@@ -1009,10 +1009,11 @@ begin
     OldWidget := nil
   else
     OldWidget := GetFirstQtObjectFromWidgetH(aold);
-  if (ANew <> nil) and not QWidget_isVisible(ANew) then
-    NewWidget := nil
+
+  if (ANew <> nil) then
+    NewWidget := GetFirstQtObjectFromWidgetH(anew)
   else
-    NewWidget := GetFirstQtObjectFromWidgetH(anew);
+    NewWidget := nil;
 
   if OldWidget = NewWidget then
   begin
diff --git a/lcl/interfaces/qt/qtpagecontrol.inc b/lcl/interfaces/qt/qtpagecontrol.inc
index 0d21052e4c..1f9260923f 100644
--- a/lcl/interfaces/qt/qtpagecontrol.inc
+++ b/lcl/interfaces/qt/qtpagecontrol.inc
@@ -69,8 +69,8 @@ begin
   if not Assigned(APage.Parent) or not APage.Parent.HandleAllocated then
     exit;
   AParent := TQtWidget(APage.Parent.Handle);
-  if AParent.ChildOfComplexWidget = ccwTTabControl then
-    exit;
+  if not (AParent is TQtTabWidget) then
+      exit;
   ATabWidget := TQtTabWidget(AParent);
 
   AColor.Alpha := 0;