diff --git a/ChangeLog b/ChangeLog
index d67982d..94e0e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-16 Riccardo Mottola <rm@gnu.org>
+
+	* Modules/Editors/ProjectCenter/PCEditorView.m:(drawRect:)
+	Fix range to use characters and not glyphs, sicne highlighting is based on chars.
+
 2020-03-24 Riccardo Mottola <rm@gnu.org>
 
 	* Framework/PCProjectLauncher.m
diff --git a/Modules/Editors/ProjectCenter/PCEditorView.m b/Modules/Editors/ProjectCenter/PCEditorView.m
index 746e434..5f3586e 100644
--- a/Modules/Editors/ProjectCenter/PCEditorView.m
+++ b/Modules/Editors/ProjectCenter/PCEditorView.m
@@ -455,12 +455,14 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start)
 
 - (void)drawRect:(NSRect)r
 {
-  NSRange drawnRange;
-
   if (highlighter)
     {
+      NSRange drawnRange;
+
       drawnRange = [[self layoutManager] 
 	glyphRangeForBoundingRect:r inTextContainer:[self textContainer]];
+      drawnRange = [[self layoutManager] characterRangeForGlyphRange:drawnRange
+                                                    actualGlyphRange:NULL];
       [highlighter highlightRange:drawnRange];
     }