diff --git a/lcl/interfaces/qt5/qtwidgets.pas b/lcl/interfaces/qt5/qtwidgets.pas
index eed8620f43..ebfc761aed 100644
--- a/lcl/interfaces/qt5/qtwidgets.pas
+++ b/lcl/interfaces/qt5/qtwidgets.pas
@@ -2229,7 +2229,7 @@ begin
         else
           setFocusPolicy(QtNoFocus);
       end else
-      if (Self is TQtTabWidget) then
+      if (Self is TQtTabWidget) or (Self is TQtCustomControl{issue #36006}) then
         setFocusPolicy(QtTabFocus)
       else
         setFocusPolicy(QtClickFocus);
diff --git a/lcl/interfaces/qt6/qtwidgets.pas b/lcl/interfaces/qt6/qtwidgets.pas
index c4255b73cd..eb5fc91e75 100644
--- a/lcl/interfaces/qt6/qtwidgets.pas
+++ b/lcl/interfaces/qt6/qtwidgets.pas
@@ -2229,7 +2229,7 @@ begin
         else
           setFocusPolicy(QtNoFocus);
       end else
-      if (Self is TQtTabWidget) then
+      if (Self is TQtTabWidget) or (Self is TQtCustomControl{issue #36006}) then
         setFocusPolicy(QtTabFocus)
       else
         setFocusPolicy(QtClickFocus);