diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index 42784de3f..7cca9f0bf 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -38,7 +38,6 @@ Item{
     property bool inForceHiding: false //is used when the docks are forced in hiding e.g. when changing layouts
     property bool normalState : false  // this is being set from updateMaskArea
     property bool previousNormalState : false // this is only for debugging purposes
-    property bool panelIsBiggerFromIconSize: root.useThemePanel && (background.totals.visualThickness >= (metrics.iconSize + metrics.margin.thickness))
 
     property bool inClientSideFloating: !root.behaveAsPlasmaPanel
                                         && screenEdgeMarginEnabled
diff --git a/containment/package/contents/ui/background/MultiLayered.qml b/containment/package/contents/ui/background/MultiLayered.qml
index 2f6056be7..111162b5f 100644
--- a/containment/package/contents/ui/background/MultiLayered.qml
+++ b/containment/package/contents/ui/background/MultiLayered.qml
@@ -178,6 +178,9 @@ BackgroundProperties{
 
     property int animationTime: 6*animations.speedFactor.current*animations.duration.small
 
+    //! Metrics related
+    readonly property bool isGreaterThanItemThickness: root.useThemePanel && (totals.visualThickness >= (metrics.iconSize + metrics.margin.thickness))
+
     //! CustomShadowedRectangle  properties
     readonly property bool customShadowedRectangleIsEnabled: customRadiusIsEnabled || (customDefShadowIsEnabled || customUserShadowIsEnabled)
 
diff --git a/containment/package/contents/ui/debugger/DebugWindow.qml b/containment/package/contents/ui/debugger/DebugWindow.qml
index 4f1edc550..89be6acf7 100644
--- a/containment/package/contents/ui/debugger/DebugWindow.qml
+++ b/containment/package/contents/ui/debugger/DebugWindow.qml
@@ -611,7 +611,7 @@ Window{
             }
 
             Text{
-                text: visibilityManager.panelIsBiggerFromIconSize
+                text: background.isGreaterThanItemThickness
             }
 
             Text{
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index c82aa917e..bbd55e491 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -103,7 +103,7 @@ Item {
         var staticLayout = (plasmoid.configuration.minLength === plasmoid.configuration.maxLength);
 
         if ((plasmoid.configuration.alignment === LatteCore.Types.Justify || staticLayout)
-                && visibilityManager.panelIsBiggerFromIconSize
+                && background.isGreaterThanItemThickness
                 && (parabolic.factor.maxZoom === 1.0)) {
             return LatteCore.Types.PanelView;
         }