diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java b/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java
index 34103e78f054..d8ac139e847e 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java
@@ -115,8 +115,19 @@ public class DiffLineSeparatorRenderer implements LineMarkerRenderer, LineSepara
 
     final int gutterWidth = ((EditorEx)myEditor).getGutterComponentEx().getWidth();
     int lineHeight = myEditor.getLineHeight();
+    int interval = 8;
 
-    draw(g, -gutterWidth, y, lineHeight);
+    int shiftX = -interval; // skip zero index painting
+    if (((EditorEx)myEditor).getVerticalScrollbarOrientation() == EditorEx.VERTICAL_SCROLLBAR_LEFT) {
+      int contentWidth = ((EditorEx)myEditor).getScrollPane().getViewport().getWidth();
+      shiftX += contentWidth % interval - interval;
+      shiftX += gutterWidth % interval - interval;
+    }
+    else {
+      shiftX += -gutterWidth % interval - interval;
+    }
+
+    draw(g, shiftX, y, lineHeight);
   }
 
   private static void draw(@NotNull Graphics g,