--- a/HierarchicalListView.st	Tue Mar 21 12:08:02 2017 +0100
+++ b/HierarchicalListView.st	Tue Mar 21 12:09:25 2017 +0100
@@ -1257,7 +1257,9 @@
         ]
     ].
     imageWidth      := ((imageWidth + 1) // 2 * 2) max:defaultWidth.
-    alignTextRightX := imageWidth + 20 max:alignTextRightX.
+    alignTextRightX := (imageWidth + 20) max:alignTextRightX.
+
+    "Modified (format): / 21-03-2017 / 09:54:38 / cg"
 ! !
 
 !HierarchicalListView methodsFor:'initialization & release'!
@@ -1447,6 +1449,7 @@
         ].
         maxWidthOfText := maxWidthOfText max:width.
         textX := self xVisibleOfIconAtLevel:(level + 1).
+        textX := textX + (viewOrigin x).
 
         alignTextRightX < textX ifTrue:[
             alignTextRightX := textX.
@@ -1466,11 +1469,13 @@
                 parent := item parent.
             ].
             widthOfLabel   := listRenderer widthFor:item.
+            width          := (widthOfLabel + textX) max:width.
             maxWidthOfText := maxWidthOfText max:widthOfLabel.
-            width          := widthOfLabel + textX max:width
         ].
     ].
-    ^ width + viewOrigin x.
+    ^ 20 + width + viewOrigin x.
+
+    "Modified: / 21-03-2017 / 09:55:37 / cg"
 !
 
 xVisibleOfIconAtLevel:aLevel
@@ -1523,23 +1528,25 @@
     xOffset  := igWidth2 + opWidth2 + imageInset.
 
     showRoot ifTrue:[ firstLevel := 1 ]
-	    ifFalse:[ firstLevel := 2 ].
+            ifFalse:[ firstLevel := 2 ].
 
     showLeftIndicators ifTrue:[
-	aLevel < firstLevel ifTrue:[
-	    xOffset := opWidth2 - (firstLevel * xOffset)
-	] ifFalse:[
-	    xOffset := opWidth2 + ((aLevel - firstLevel) * xOffset)
-	]
+        aLevel < firstLevel ifTrue:[
+            xOffset := opWidth2 - (firstLevel * xOffset)
+        ] ifFalse:[
+            xOffset := opWidth2 + ((aLevel - firstLevel) * xOffset)
+        ]
     ] ifFalse:[
-	aLevel < 2 ifTrue:[
-	    xOffset := igWidth2 - ((aLevel - firstLevel) * xOffset)
-	] ifFalse:[
-	    xOffset := igWidth2 + ((aLevel - firstLevel - 1) * xOffset)
-	].
+        aLevel < 2 ifTrue:[
+            xOffset := igWidth2 - ((aLevel - firstLevel) * xOffset)
+        ] ifFalse:[
+            xOffset := igWidth2 + ((aLevel - firstLevel - 1) * xOffset)
+        ].
     ].
     "/ 2 := a left margin
     ^ xOffset + 2 - (viewOrigin x)
+
+    "Modified: / 21-03-2017 / 09:40:13 / cg"
 !
 
 yVisibleOfIndicatorForItem:anItem