--- a/Tools__TagsBrowser.st	Mon Sep 19 18:00:08 2016 +0200
+++ b/Tools__TagsBrowser.st	Thu Sep 22 11:19:31 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
 	      All Rights Reserved
@@ -2821,8 +2823,8 @@
 !TagsBrowser::TagView methodsFor:'drawing'!
 
 drawLabelAt:anIndex x:x y:y h:h
-    "draw the label at position x/y without clearing the background
-    "
+    "draw the label at position x/y without clearing the background"
+
     |item label typeIdentifier font
      y0 widthOfTypeIdentifier inset inSelection lineNrString|
 
@@ -2856,12 +2858,12 @@
         widthOfTypeIdentifier := 0
     ] ifFalse:[
         typeIdentifier := Text string:typeIdentifier emphasis:#bold.
-        typeIdentifier displayOn:self x:x y:y0.
-        widthOfTypeIdentifier := (font widthOf:typeIdentifier)+(font widthOf:' ').
+        typeIdentifier displayOn:gc x:x y:y0.
+        widthOfTypeIdentifier := (typeIdentifier widthOn:gc) + font width "... of a space".
     ].
     inset := TypeInset max:widthOfTypeIdentifier.
 
-    label displayOn:self x:(x + inset) y:y0
+    label displayOn:gc x:(x + inset) y:y0
 
     "Modified: / 17-03-2012 / 11:15:27 / cg"
     "Modified: / 23-06-2014 / 21:23:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"