diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml
index 1cbd2d39f..db7a7cb69 100644
--- a/containment/contents/ui/VisibilityManager.qml
+++ b/containment/contents/ui/VisibilityManager.qml
@@ -102,9 +102,9 @@ Item{
 
     function slotMustBeHide() {
         // console.log("hide....");
-        if (!plasmoid.userConfiguring) {
-            slidingAnimationAutoHiddenOut.init();
-        }
+        //if (!plasmoid.userConfiguring) {
+        slidingAnimationAutoHiddenOut.init();
+        //}
     }
 
     function slotModeChanged() {
diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml
index 6b7fa45c0..2c6e6f67e 100644
--- a/containment/contents/ui/main.qml
+++ b/containment/contents/ui/main.qml
@@ -551,6 +551,8 @@ DragDrop.DropArea {
         }
 
         if (plasmoid.userConfiguring) {
+            dock.visibility.blockHiding = true;
+
             //  console.log("applets------");
             for (var i = 0; i < plasmoid.applets.length; ++i) {
                 //    console.log("applet:"+i);
@@ -569,6 +571,8 @@ DragDrop.DropArea {
                 dragOverlay.visible = true;
             }
         } else {
+            dock.visibility.blockHiding = false;
+
             if (dragOverlay) {
                 dragOverlay.visible = false;
                 dragOverlay.destroy();
@@ -864,7 +868,7 @@ DragDrop.DropArea {
     }
 
     function slotDisableHiding(value) {
-        // dock.visibility.disableHiding = value;
+        dock.visibility.blockHiding = value;
     }
 
     function updateAutomaticIconSize() {