diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml
index 51b25a645..f265902d6 100644
--- a/containment/package/contents/ui/applet/ItemWrapper.qml
+++ b/containment/package/contents/ui/applet/ItemWrapper.qml
@@ -45,8 +45,11 @@ Item{
         }
 
         if (appletItem.isAutoFillApplet) {
-            return appletItem.layouter.maxMetricsInHigherPriority ?
-                        appletItem.maxAutoFillLength : Math.max(appletItem.minAutoFillLength, appletPreferredLength);
+            if (appletItem.layouter.maxMetricsInHigherPriority) {
+                return appletItem.maxAutoFillLength;
+            }
+
+            return Math.max(appletItem.minAutoFillLength,Math.min(appletPreferredLength,appletItem.maxAutoFillLength));
         }
 
         return root.inConfigureAppletsMode ? Math.max(Math.min(appletItem.metrics.iconSize, root.minAppletLengthInConfigure), scaledLength) : scaledLength;