--- a/Tools__CodeView2.st	Tue Dec 03 22:27:47 2019 +0100
+++ b/Tools__CodeView2.st	Tue Dec 03 22:28:30 2019 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
               All Rights Reserved
@@ -1195,10 +1193,12 @@
     allAnnotations := OrderedCollection new.
     allBreakpoints := OrderedCollection new.
     services do:[:eachService |
-        allAnnotations addAll:(eachService annotations ? #()).
-        eachService isBreakpointService ifTrue:[
-            allBreakpoints addAll:(eachService breakpoints ? #()).
-        ].    
+        eachService enabled ifTrue:[
+            allAnnotations addAll:(eachService annotations ? #()).
+            eachService isBreakpointService ifTrue:[
+                allBreakpoints addAll:(eachService breakpoints ? #()).
+            ].
+        ]
     ].
 
     verticalScrollBar := textViewScroller verticalScrollBar.
@@ -3064,12 +3064,14 @@
                 
     services do:[:eachService |
         |tooltip|
-        
-        tooltip := eachService helpTextAtLine:lineNr.
-        tooltip notEmptyOrNil ifTrue:[
-            textCollector notEmpty ifTrue:[ textCollector cr].
-            textCollector nextPutAllText:tooltip withCRs.
-            tooltip last == Character cr ifFalse:[textCollector cr].
+
+        eachService enabled ifTrue:[
+            tooltip := eachService helpTextAtLine:lineNr.
+            tooltip notEmptyOrNil ifTrue:[
+                textCollector notEmpty ifTrue:[ textCollector cr].
+                textCollector nextPutAllText:tooltip withCRs.
+                tooltip last == Character cr ifFalse:[textCollector cr].
+            ].
         ].
     ].
     textCollector isEmpty ifTrue:[ ^ nil ].