diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index d5f74b748..a616e602f 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -57,7 +57,7 @@ Item {
 
     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);
+    readonly property bool isMarginsAreaSeparator: applet && applet.pluginName === "org.kde.plasma.marginsseparator"
 
     readonly property color highlightColor: theme.buttonFocusColor
 
@@ -66,16 +66,16 @@ Item {
     property bool isAutoFillApplet:  isRequestingFill
 
     property bool isRequestingFill: {
-        if (!applet || !applet.Layout)
+        if (!applet || !applet.Layout) {
             return false;
+        }
 
-        if (((root.isHorizontal && applet.Layout.fillWidth===true)
-             || (root.isVertical && applet.Layout.fillHeight===true))
-                && (!isHidden)) {
-            return true;
-        } else {
-            return false;
+        if ((root.isHorizontal && applet.Layout.fillWidth===true)
+             || (root.isVertical && applet.Layout.fillHeight===true)) {
+            return !isHidden;
         }
+
+        return false;
     }
 
     property int maxAutoFillLength: -1 //it is used in calculations for fillWidth,fillHeight applets
diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml
index 84b991bed..db5ebe2a7 100644
--- a/containment/package/contents/ui/applet/ItemWrapper.qml
+++ b/containment/package/contents/ui/applet/ItemWrapper.qml
@@ -46,7 +46,7 @@ Item{
             }
         }
 
-        if ((isSeparator || appletItem.isMarginsAreaSeparator) && appletItem.parabolic.isEnabled) {
+        if ((isSeparator || isMarginsAreaSeparator) && appletItem.parabolic.isEnabled) {
             return -1;
         }
 
@@ -58,7 +58,6 @@ Item{
             }
 
             var result = Math.max(appletItem.minAutoFillLength,Math.min(appletPreferredLength,appletItem.maxAutoFillLength));
-
             return isInternalViewSplitter? result + 1 : result;
         }