diff --git a/containment/contents/ui/PanelBox.qml b/containment/contents/ui/PanelBox.qml
index 7aabeee89..7377af4e9 100644
--- a/containment/contents/ui/PanelBox.qml
+++ b/containment/contents/ui/PanelBox.qml
@@ -153,7 +153,7 @@ Item{
                     adjustPrefix();
             }
 
-            enabledBorders: dock.enabledBorders
+            enabledBorders: dock ? dock.enabledBorders : 0
 
             function adjustPrefix() {
                 if (!plasmoid) {
diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml
index e43467223..908cdcee4 100644
--- a/containment/contents/ui/VisibilityManager.qml
+++ b/containment/contents/ui/VisibilityManager.qml
@@ -260,7 +260,7 @@ Item{
             maskThickness = maskArea.width;
         }
 
-        // console.log("Not updating mask...");
+       //  console.log("Not updating mask...");
         if( maskArea.x !== localX || maskArea.y !== localY
                 || maskLength !== tempLength || maskThickness !== tempThickness) {
 
@@ -283,8 +283,8 @@ Item{
                 dock.maskArea = newMaskArea;
             }
 
-            //console.log("update mask area:"+newMaskArea);
-            if(normalState && !dock.visibility.isHidden){
+            // console.log("update mask area:"+newMaskArea);
+            if((normalState && !dock.visibility.isHidden) || root.editMode){
 
                 //the shadows size must be removed from the maskArea
                 //before updating the localDockGeometry
@@ -308,7 +308,7 @@ Item{
                 }
 
                 dock.setLocalDockGeometry(newMaskArea);
-                //  console.log("update dock geometry:"+newMaskArea);
+                // console.log("update dock geometry:"+newMaskArea);
             }
         }
     }