diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index 60a922c46..80c6d0e92 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -55,6 +55,7 @@ Item {
     property bool canShowAppletNumberBadge: !indexerIsSupported && !isSeparator && !isHidden
                                             && !isSpacer && !isInternalViewSplitter
 
+    readonly property bool canFillScreenEdge: communicator.requires.screenEdgeMarginSupported || communicator.indexerIsSupported
     readonly property bool canFillThickness: applet && applet.hasOwnProperty("constraintHints") && (applet.constraintHints & PlasmaCore.Types.CanFillArea);
     readonly property bool isMarginsAreaSeparator: applet && applet.hasOwnProperty("constraintHints") && (applet.constraintHints & PlasmaCore.Types.MarginAreasSeparator);
 
diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml
index 44cac884d..e54cdc6e4 100644
--- a/containment/package/contents/ui/applet/ItemWrapper.qml
+++ b/containment/package/contents/ui/applet/ItemWrapper.qml
@@ -459,10 +459,12 @@ Item{
         property int _length:0 // through Binding to avoid binding loops
         property int _thickness:0 // through Binding to avoid binding loops
 
-        readonly property int appliedEdgeMargin: appletItem.screenEdgeMarginSupported ? 0 : appletItem.metrics.margin.screenEdge
+        readonly property int appliedEdgeMargin: appletItem.canFillScreenEdge ? 0 : appletItem.metrics.margin.screenEdge
         readonly property int tailThicknessMargin: {
-            if (appletItem.screenEdgeMarginSupported) {
+            if (appletItem.canFillScreenEdge) {
                 return 0;
+            } else if (appletItem.canFillThickness) {
+                return appliedEdgeMargin;
             } else if (appletItem.inMarginsArea) {
                 return appliedEdgeMargin + (wrapper.zoomScaleThickness * appletItem.metrics.marginsArea.marginThickness);
             }
@@ -471,7 +473,7 @@ Item{
         }
 
         readonly property int headThicknessMargin: {
-            if (appletItem.canFillThickness || appletItem.screenEdgeMarginSupported) {
+            if (appletItem.canFillThickness || appletItem.canFillScreenEdge) {
                 return 0;
             } else if (appletItem.inMarginsArea) {
                 return appletItem.metrics.marginsArea.marginThickness;
@@ -489,8 +491,9 @@ Item{
                     return wrapper.layoutThickness;
                 }
 
-                var wrapperContainerThickness =  appletItem.screenEdgeMarginSupported ? appletItem.metrics.totals.thickness : wrapper.zoomScaleThickness * proposedItemSize;
-                return appletItem.screenEdgeMarginSupported ? wrapperContainerThickness + appletItem.metrics.margin.screenEdge : wrapperContainerThickness;
+                var canfillthickness = (appletItem.canFillScreenEdge || appletItem.canFillThickness);
+                var wrapperContainerThickness =  canfillthickness ? appletItem.metrics.totals.thickness : wrapper.zoomScaleThickness * proposedItemSize;
+                return appletItem.canFillScreenEdge ? wrapperContainerThickness + appletItem.metrics.margin.screenEdge : wrapperContainerThickness;
             }
         }
 
diff --git a/containment/package/contents/ui/applet/PaddingsInConfigureApplets.qml b/containment/package/contents/ui/applet/PaddingsInConfigureApplets.qml
index 80931b3f5..5c896dde1 100644
--- a/containment/package/contents/ui/applet/PaddingsInConfigureApplets.qml
+++ b/containment/package/contents/ui/applet/PaddingsInConfigureApplets.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 
 Item {
     readonly property int thickness: {
-        if (appletItem.canFillThickness || appletItem.screenEdgeMarginSupported) {
+        if (appletItem.canFillThickness || appletItem.canFillScreenEdge) {
             return 1;
         } else if (appletItem.inMarginsArea) {
             return appletItem.metrics.marginsArea.marginThickness;