diff --git a/containment/contents/ui/EditModeVisual.qml b/containment/contents/ui/EditModeVisual.qml
index 0755176f9..79e548622 100644
--- a/containment/contents/ui/EditModeVisual.qml
+++ b/containment/contents/ui/EditModeVisual.qml
@@ -80,7 +80,7 @@ Image{
         if (editAnimationEnded && !root.drawShadowsExternal) {
             dock.shadow = root.editShadow;
         } else {
-            dock.shadow = 0;
+            dock.shadow = root.panelShadow;
         }
     }
 
diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml
index 58c5faf18..b8ded7765 100644
--- a/containment/contents/ui/VisibilityManager.qml
+++ b/containment/contents/ui/VisibilityManager.qml
@@ -86,6 +86,13 @@ Item{
         value: root.drawShadowsExternal
     }
 
+    Binding{
+        target: dock
+        property:"shadow"
+        when: dock
+        value: root.panelShadow
+    }
+
     Binding{
         target: dock
         property: "maxLength"