diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index f5faa05be0..1126e9d7c1 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -6883,8 +6883,11 @@ begin
     GutterRightPartList.Sort;
     for i := 0 to GutterRightPartList.Count - 1 do begin
       GutterRightPartList[i].ApplyTo(ASynEdit.RightGutter.Parts.ByClass[GutterRightPartList[i].GClass, 0]);
-      GutterRightPartList[i].ApplyIndexTo(ASynEdit.RightGutter.Parts.ByClass[GutterRightPartList[i].GClass, 0]);
+      //TODO: currently separators are not managed => index is not correct
+      //GutterRightPartList[i].ApplyIndexTo(ASynEdit.RightGutter.Parts.ByClass[GutterRightPartList[i].GClass, 0]);
     end;
+    for i := 0 to ASynEdit.RightGutter.Parts.ByClassCount[TSynGutterSeparator] - 1 do
+      ASynEdit.RightGutter.Parts.ByClass[TSynGutterSeparator, i].Visible := FGutterPartOver.Visible;
 
     ASynEdit.ScrollOnEditLeftOptions.Assign(ScrollOnEditLeftOptions);
     ASynEdit.ScrollOnEditRightOptions.Assign(ScrollOnEditRightOptions);
diff --git a/ide/frames/editor_display_options.pas b/ide/frames/editor_display_options.pas
index 73c9214255..00f46e9d91 100644
--- a/ide/frames/editor_display_options.pas
+++ b/ide/frames/editor_display_options.pas
@@ -185,8 +185,10 @@ begin
         end;
         for j := 0 to FCurGutterRightPartList.Count - 1 do begin
           FCurGutterRightPartList[j].ApplyTo(PreviewEdits[i].RightGutter.Parts.ByClass[FCurGutterRightPartList[j].GClass, 0]);
-          FCurGutterRightPartList[j].ApplyIndexTo(PreviewEdits[i].RightGutter.Parts.ByClass[FCurGutterRightPartList[j].GClass, 0]);
+          //TODO: currently separators are not managed => index is not correct
+          //FCurGutterRightPartList[j].ApplyIndexTo(PreviewEdits[i].RightGutter.Parts.ByClass[FCurGutterRightPartList[j].GClass, 0]);
         end;
+        // TODO: visibility of separators
       end;
   col := TEditorColorOptionsFrame(FDialog.FindEditor(TEditorColorOptionsFrame));
   if col <> nil then