diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -583,12 +583,10 @@
                         return gridView.width;
                     } else {
                         var iconWidth = iconSize + (2 * units.largeSpacing) + (2 * units.smallSpacing);
-                        if (root.isContainment && isRootView && scrollArea.viewportWidth > 0) {
-                            var extraWidth = calcExtraSpacing(iconWidth, scrollArea.viewportWidth);
-                            return iconWidth + extraWidth;
-                        } else {
-                            return iconWidth;
+                        if (isRootView && scrollArea.viewportWidth > 0) {
+                            iconWidth += calcExtraSpacing(iconWidth, scrollArea.viewportWidth);
                         }
+                        return iconWidth;
                     }
                 }
 
@@ -599,12 +597,10 @@
                             listItemSvg.margins.top + listItemSvg.margins.bottom)) / 2) * 2;
                     } else {
                         var iconHeight = iconSize + (theme.mSize(theme.defaultFont).height * plasmoid.configuration.textLines) + (6 * units.smallSpacing);
-                        if (root.isContainment && isRootView && scrollArea.viewportHeight > 0) {
-                            var extraHeight = calcExtraSpacing(iconHeight, scrollArea.viewportHeight);
-                            return iconHeight + extraHeight;
-                        } else {
-                            return iconHeight;
+                        if (isRootView && scrollArea.viewportHeight > 0) {
+                            iconHeight += calcExtraSpacing(iconHeight, scrollArea.viewportHeight);
                         }
+                        return iconHeight;
                     }
                 }