diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml
index 56ac8e4ca..d9be898ac 100644
--- a/containment/contents/ui/VisibilityManager.qml
+++ b/containment/contents/ui/VisibilityManager.qml
@@ -76,13 +76,15 @@ Item{
     }
 
     function slotMustBeShown() {
-      //  console.log("show...");
+        //  console.log("show...");
         slidingAnimationAutoHiddenIn.init();
     }
 
     function slotMustBeHide() {
-       // console.log("hide....");
-        slidingAnimationAutoHiddenOut.init();
+        // console.log("hide....");
+        if (!plasmoid.userConfiguring) {
+            slidingAnimationAutoHiddenOut.init();
+        }
     }
 
     function slotModeChanged() {
diff --git a/plasmoid/contents/ui/ContextMenu.qml b/plasmoid/contents/ui/ContextMenu.qml
index dc3ec103d..88e4e4501 100644
--- a/plasmoid/contents/ui/ContextMenu.qml
+++ b/plasmoid/contents/ui/ContextMenu.qml
@@ -593,7 +593,9 @@ PlasmaComponents.ContextMenu {
     PlasmaComponents.MenuItem {
         property QtObject configureAction: null
 
-        visible: !nowDockPanel
+        //FIXME: when Tasks settings have been included in Latte configuration window
+        //this can be enabled!!!
+        //visible: !nowDockPanel
         enabled: configureAction && configureAction.enabled
 
         text: configureAction ? configureAction.text : ""