diff --git a/workspace.cpp b/workspace.cpp
index 84c960f589..a3386763d1 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -324,7 +324,6 @@ void Workspace::init()
         NET::WM2DesktopLayout |
         NET::WM2FullPlacement |
         NET::WM2FullscreenMonitors |
-        NET::WM2FrameOverlap |
         0
         ,
         NET::ActionMove |
@@ -341,6 +340,9 @@ void Workspace::init()
         ,
         };
 
+    if ( mgr->factory()->supports( AbilityExtendIntoClientArea ) )
+        protocols[ NETRootInfo::PROTOCOLS2 ] |= NET::WM2FrameOverlap;
+
     QX11Info info;
     rootInfo = new RootInfo( this, display(), supportWindow->winId(), "KWin", protocols, 5, info.screen() );
 
@@ -1132,6 +1134,7 @@ void Workspace::slotReconfigure()
         (*it)->applyWindowRules();
         discardUsedWindowRules( *it, false );
         }
+    rootInfo->setSupported( NET::WM2FrameOverlap, mgr->factory()->supports( AbilityExtendIntoClientArea ) );
     }
 
 void Workspace::slotReinitCompositing()