diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp
index 4ad21744..b1c428a9 100644
--- a/src/controls/QskFocusIndicator.cpp
+++ b/src/controls/QskFocusIndicator.cpp
@@ -148,6 +148,15 @@ void QskFocusIndicator::updateFocusFrame()
     if ( !r.isEmpty() )
     {
         r = r.marginsAdded( marginsHint( Panel | QskAspect::Padding ) );
+
+        if ( auto w = window() )
+        {
+            QRectF clipRect( 0, 0, w->width(), w->height() );
+            clipRect = parentItem()->mapRectFromScene( clipRect );
+    
+            r = r.intersected( clipRect );
+        }
+
         setGeometry( r );
 
         const auto clipRect = qskFocusIndicatorClipRect( m_data->clippingItem );