diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -204,6 +204,8 @@
     }
 
     Plasmoid.onUserConfiguringChanged: {
+        containmentSizeSyncTimer.restart();
+
         if (plasmoid.immutable) {
             if (dragOverlay) {
                 dragOverlay.destroy();
@@ -233,7 +235,7 @@
     }
 
     Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart();
-    Plasmoid.onImmutableChanged: containmentSizeSyncTimer.restart();
+    Containment.onEditModeChanged: containmentSizeSyncTimer.restart();
 
     onToolBoxChanged: {
         containmentSizeSyncTimer.restart();
@@ -419,10 +421,10 @@
         interval: 150
         onTriggered: {
             dndSpacer.parent = root;
-            currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && !plasmoid.immutable) ? toolBox.width : 0;
+            currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && (plasmoid.editMode || plasmoid.userConfiguring)) ? toolBox.width : 0;
             currentLayout.y = 0
-            currentLayout.width = root.width - (isHorizontal && toolBox && !plasmoid.immutable ? toolBox.width : 0)
-            currentLayout.height = root.height - (!isHorizontal && toolBox && !plasmoid.immutable ? toolBox.height : 0)
+            currentLayout.width = root.width - (isHorizontal && toolBox && (plasmoid.editMode || plasmoid.userConfiguring) ? toolBox.width : 0)
+            currentLayout.height = root.height - (!isHorizontal && toolBox && (plasmoid.editMode || plasmoid.userConfiguring) ? toolBox.height : 0)
             currentLayout.isLayoutHorizontal = isHorizontal
         }
     }
diff --git a/toolboxes/paneltoolbox/contents/ui/main.qml b/toolboxes/paneltoolbox/contents/ui/main.qml
--- a/toolboxes/paneltoolbox/contents/ui/main.qml
+++ b/toolboxes/paneltoolbox/contents/ui/main.qml
@@ -29,7 +29,7 @@
     width: isVertical ? units.iconSizes.medium : units.iconSizes.smallMedium + units.smallSpacing * 2
     height: isVertical ? units.iconSizes.smallMedium + units.smallSpacing * 2 : units.iconSizes.medium
     property bool isVertical: plasmoid.formFactor === 3
-    opacity: plasmoid.immutable ? 0 : (mouseArea.containsMouse || plasmoid.userConfiguring ? 1 : 0.5)
+    opacity: plasmoid.editMode || plasmoid.userConfiguring ? (mouseArea.containsMouse || plasmoid.userConfiguring ? 1 : 0.5) : 0
 
     z: 999
 
@@ -77,7 +77,7 @@
         id: mouseArea
         anchors.fill: parent
         hoverEnabled: enabled
-        enabled: !plasmoid.immutable
+        enabled: plasmoid.editMode || plasmoid.userConfiguring
         onClicked: {
             main.Plasmoid.action("configure").trigger()
         }