diff --git a/app/dockview.cpp b/app/dockview.cpp
index 2c956e6ee..5c53ee460 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -71,6 +71,9 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen)
         if (!m_visibility) {
             m_visibility = new VisibilityManager(this);
         }
+
+        //QAction *lockWidgetsAction = containment()->actions()->action("lock widgets");
+        //containment()->actions()->removeAction(lockWidgetsAction);
         
     }, Qt::DirectConnection);
 }
diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml
index 2c6e6f67e..f808bf703 100644
--- a/containment/contents/ui/main.qml
+++ b/containment/contents/ui/main.qml
@@ -551,6 +551,9 @@ DragDrop.DropArea {
         }
 
         if (plasmoid.userConfiguring) {
+            if (dock.visibility.isHidden) {
+                dock.visibility.mustBeShown();
+            }
             dock.visibility.blockHiding = true;
 
             //  console.log("applets------");
@@ -573,6 +576,10 @@ DragDrop.DropArea {
         } else {
             dock.visibility.blockHiding = false;
 
+            if (dock.visibility.isHidden) {
+                dock.visibility.mustBeShown();
+            }
+
             if (dragOverlay) {
                 dragOverlay.visible = false;
                 dragOverlay.destroy();