diff --git a/composite.cpp b/composite.cpp
index d543352766..e256110904 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -830,7 +830,8 @@ void Toplevel::addWorkspaceRepaint( const QRect& r2 )
 bool Toplevel::updateUnredirectedState()
     {
     assert( compositing());
-    bool should = shouldUnredirect() && !unredirectSuspend && !shape() && !hasAlpha() && opacity() == 1.0;
+    bool should = shouldUnredirect() && !unredirectSuspend && !shape() && !hasAlpha() && opacity() == 1.0 &&
+        !static_cast<EffectsHandlerImpl*>( effects )->activeFullScreenEffect();
     if( should && !unredirect )
         {
         unredirect = true;
diff --git a/effects.cpp b/effects.cpp
index 8de9cd6903..d45bf41333 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -305,6 +305,7 @@ void EffectsHandlerImpl::tabBoxUpdated()
 void EffectsHandlerImpl::setActiveFullScreenEffect( Effect* e )
     {
     fullscreen_effect = e;
+    Workspace::self()->checkUnredirect();
     }
 
 Effect* EffectsHandlerImpl::activeFullScreenEffect() const