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
@@ -1151,8 +1151,9 @@
             }
             
             function getWidth(addWidthVerticalScroller) {
-                return(targetItem.width - units.largeSpacing * 2 - (isPopup ? 0 : units.smallSpacing * 2) + __style.padding.left + __style.padding.right + 
-                       (addWidthVerticalScroller ? __verticalScrollBar.parent.verticalScrollbarOffset : 0));
+                var _width = isPopup ? targetItem.width - units.largeSpacing * 2 : targetItem.label.paintedWidth;
+                return _width + __style.padding.left + __style.padding.right +
+                       (addWidthVerticalScroller ? __verticalScrollBar.parent.verticalScrollbarOffset : 0);
             }
             
             function getHeight(addWidthHoriozontalScroller, init) {