diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index 9c2d57bc9..0bac26f47 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -63,7 +63,7 @@ Item{
     property int thicknessNormalOriginalValue: root.maxIconSize + (root.maxThickMargin * 2) + extraThickMask + 1
     property int thicknessZoomOriginal: Math.max( ((root.maxIconSize+(root.maxThickMargin * 2)) * root.zoomFactor) + extraThickMask + 2,
                                                  root.realPanelSize + root.panelShadow,
-                                                 thicknessEditMode )
+                                                 (Latte.WindowSystem.compositingActive ? thicknessEditMode + root.editShadow : thicknessEditMode))
 
     //! is used from Panel in edit mode in order to provide correct masking
     property int thicknessEditMode: thicknessNormalOriginalValue + editModeVisual.settingsThickness
diff --git a/containment/package/contents/ui/editmode/Visual.qml b/containment/package/contents/ui/editmode/Visual.qml
index d54c66399..d8547f58e 100644
--- a/containment/package/contents/ui/editmode/Visual.qml
+++ b/containment/package/contents/ui/editmode/Visual.qml
@@ -232,7 +232,7 @@ Item{
 
     Connections{
         target: root
-        onThemeColorsChanged: imagaTiler.opacity = editVisual.maxOpacity
+        onThemeColorsChanged: imageTiler.opacity = editVisual.maxOpacity
     }
 
     Connections{