diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp
index c5aeef4892..00fa544e6d 100644
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@@ -5705,6 +5705,10 @@ begin
       end;
       RecalcCharExtent;
       ScanRanges; // Todo: Skip if paintlocked
+      // There may not have been a scan
+      if fHighlighter <> nil then
+        FHighlighter.CurrentLines := FLines;
+      FLines.SendNotification(senrHighlightChanged, FLines, -1, -1);
     finally
       DecPaintLock;
     end;
diff --git a/ide/sourcesyneditor.pas b/ide/sourcesyneditor.pas
index daf0a17c32..9cbf9fc7df 100644
--- a/ide/sourcesyneditor.pas
+++ b/ide/sourcesyneditor.pas
@@ -933,6 +933,7 @@ begin
   TSynEditStringList(TextBuffer).AddGenericHandler(senrTextBufferChanged,
     TMethod({$IFDEF FPC}@{$ENDIF}BufferChanged));
   //LineCountChanged(nil, 0, 0);
+  HighlightChanged(nil,-1,-1);
 end;
 
 procedure TIDESynGutterLOvProviderPascal.HighlightChanged(Sender: TSynEditStrings; AIndex,