diff --git a/effects/magiclamp/magiclamp.cpp b/effects/magiclamp/magiclamp.cpp
index bc7c427c4b..bd1a4fc3ef 100644
--- a/effects/magiclamp/magiclamp.cpp
+++ b/effects/magiclamp/magiclamp.cpp
@@ -369,6 +369,8 @@ void MagicLampEffect::windowDeleted( EffectWindow* w )
 
 void MagicLampEffect::windowMinimized( EffectWindow* w )
     {
+    if ( effects->activeFullScreenEffect() )
+        return;
     mTimeLineWindows[w].setCurveShape(TimeLine::LinearCurve);
     mTimeLineWindows[w].setDuration( mAnimationDuration );
     mTimeLineWindows[w].setProgress(0.0f);
@@ -376,6 +378,8 @@ void MagicLampEffect::windowMinimized( EffectWindow* w )
 
 void MagicLampEffect::windowUnminimized( EffectWindow* w )
     {
+    if ( effects->activeFullScreenEffect() )
+        return;
     mTimeLineWindows[w].setCurveShape(TimeLine::LinearCurve);
     mTimeLineWindows[w].setDuration( mAnimationDuration );
     mTimeLineWindows[w].setProgress(1.0f);
diff --git a/effects/minimizeanimation/minimizeanimation.cpp b/effects/minimizeanimation/minimizeanimation.cpp
index 39f86ac0e4..fddcfccb42 100644
--- a/effects/minimizeanimation/minimizeanimation.cpp
+++ b/effects/minimizeanimation/minimizeanimation.cpp
@@ -121,6 +121,8 @@ void MinimizeAnimationEffect::windowDeleted( EffectWindow* w )
 
 void MinimizeAnimationEffect::windowMinimized( EffectWindow* w )
     {
+    if ( effects->activeFullScreenEffect() )
+        return;
     TimeLine &timeline = mTimeLineWindows[w];
     timeline.setCurveShape(TimeLine::EaseInCurve);
     timeline.setDuration( animationTime( 250 ));
@@ -129,6 +131,8 @@ void MinimizeAnimationEffect::windowMinimized( EffectWindow* w )
 
 void MinimizeAnimationEffect::windowUnminimized( EffectWindow* w )
     {
+    if ( effects->activeFullScreenEffect() )
+        return;
     TimeLine &timeline = mTimeLineWindows[w];
     timeline.setCurveShape(TimeLine::EaseOutCurve);
     timeline.setDuration( animationTime( 250 ));