diff --git a/app/view/positioner.cpp b/app/view/positioner.cpp
index 3363974d1..3e88edce5 100644
--- a/app/view/positioner.cpp
+++ b/app/view/positioner.cpp
@@ -605,7 +605,7 @@ QRect Positioner::maximumNormalGeometry()
     int xPos = 0;
     int yPos = m_view->screen()->geometry().y();;
     int maxHeight = m_view->screen()->geometry().height();
-    int maxWidth = m_view->normalThickness();
+    int maxWidth = m_view->maxNormalThickness();
     QRect maxGeometry;
     maxGeometry.setRect(0, 0, maxWidth, maxHeight);
 
diff --git a/app/view/view.cpp b/app/view/view.cpp
index 0ab91a44f..e21e0584e 100644
--- a/app/view/view.cpp
+++ b/app/view/view.cpp
@@ -716,15 +716,6 @@ bool View::contextMenuIsShown() const
     return m_contextMenu->menu();
 }
 
-int View::currentThickness() const
-{
-    if (formFactor() == Plasma::Types::Vertical) {
-        return m_effects->mask().isNull() ? width() : m_effects->mask().width() - m_effects->innerShadow();
-    } else {
-        return m_effects->mask().isNull() ? height() : m_effects->mask().height() - m_effects->innerShadow();
-    }
-}
-
 int View::normalThickness() const
 {
     return m_normalThickness;
diff --git a/app/view/view.h b/app/view/view.h
index e21186ccf..e58993ee8 100644
--- a/app/view/view.h
+++ b/app/view/view.h
@@ -153,8 +153,6 @@ public:
     bool onPrimary() const;
     void setOnPrimary(bool flag);
 
-    int currentThickness() const;
-
     bool behaveAsPlasmaPanel() const;
     void setBehaveAsPlasmaPanel(bool behavior);
 
diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml
index ca8017344..6f857aa34 100644
--- a/containment/package/contents/ui/VisibilityManager.qml
+++ b/containment/package/contents/ui/VisibilityManager.qml
@@ -101,7 +101,7 @@ Item{
         target: latteView
         property:"normalThickness"
         when: latteView && inPublishingState
-        value: root.behaveAsPlasmaPanel ? thicknessAsPanel : metrics.mask.screenEdge + metrics.mask.maxNormalForItemsWithoutScreenEdge
+        value: root.behaveAsPlasmaPanel ? thicknessAsPanel : metrics.mask.screenEdge + metrics.mask.thickness.maxNormalForItemsWithoutScreenEdge
     }
 
     Binding{
diff --git a/shell/package/contents/configuration/LatteDockConfiguration.qml b/shell/package/contents/configuration/LatteDockConfiguration.qml
index c5c74c272..591653253 100644
--- a/shell/package/contents/configuration/LatteDockConfiguration.qml
+++ b/shell/package/contents/configuration/LatteDockConfiguration.qml
@@ -55,7 +55,7 @@ FocusScope {
     //!    we use 100px. or 50px. in order to give space for othe views to be shown and to have also
     //!    some space around the settings window
     property int maxHeight: plasmoid.formFactor === PlasmaCore.Types.Horizontal ?
-                                viewConfig.availableScreenGeometry.height - latteView.editThickness - units.largeSpacing :
+                                viewConfig.availableScreenGeometry.height - (latteView.editThickness - latteView.maxNormalThickness) - units.largeSpacing :
                                 viewConfig.availableScreenGeometry.height - 2 * units.largeSpacing
 
     property int maxWidth: 0.6 * latteView.screenGeometry.width