diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml
index c08f18912..9adb15ff6 100644
--- a/containment/package/contents/ui/PanelBox.qml
+++ b/containment/package/contents/ui/PanelBox.qml
@@ -76,7 +76,17 @@ Item{
     property int smallSize: Math.max(3.7*root.statesLineSize, 16)
 
     Behavior on opacity{
-        NumberAnimation { duration: 150 }
+        enabled: Latte.WindowSystem.compositingActive
+        NumberAnimation {
+            duration: 200
+        }
+    }
+
+    Behavior on opacity{
+        enabled: !Latte.WindowSystem.compositingActive
+        NumberAnimation {
+            duration: 0
+        }
     }
 
     Binding {
@@ -136,9 +146,16 @@ Item{
         enabledBorders: dock ? dock.enabledBorders : PlasmaCore.FrameSvg.NoBorder
 
         Behavior on opacity {
+            enabled: Latte.WindowSystem.compositingActive
             NumberAnimation { duration: 8*root.durationTime*units.shortDuration }
         }
 
+
+        Behavior on opacity{
+            enabled: !Latte.WindowSystem.compositingActive
+            NumberAnimation { duration: 0 }
+        }
+
         property int marginsWidth: {
             if (imagePath === "") {
                 return 0;
@@ -201,9 +218,15 @@ Item{
         }
 
         Behavior on opacity{
+            enabled: Latte.WindowSystem.compositingActive
             NumberAnimation { duration: 200 }
         }
 
+        Behavior on opacity{
+            enabled: !Latte.WindowSystem.compositingActive
+            NumberAnimation { duration: 0 }
+        }
+
         Binding {
             target: root
             property: "panelShadow"