diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java
index f2fcc6a5e983..ca0c129da027 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java
@@ -172,6 +172,7 @@ public abstract class DiffMarkup implements EditorSource, Disposable {
     marker.setLineSeparatorRenderer(new LineSeparatorRenderer() {
       @Override
       public void drawLine(Graphics g, int x1, int x2, int y) {
+        x2 = g.getClipBounds().width - x1;
         if (type.isInlineWrapper()) {
           UIUtil.drawLine((Graphics2D)g, x1, y, x2, y, null, DiffUtil.getFramingColor(color));
         }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
index 9262a9524f8c..4425112730d3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
@@ -136,6 +136,7 @@ public class ChangeType {
         Graphics2D g2 = (Graphics2D)g;
         Color color = myDiffType.getPolygonColor(markup.getEditor());
         if (color != null) {
+          x2 = g.getClipBounds().width - x1;
           if (type.isApplied()) {
             UIUtil.drawBoldDottedLine(g2, x1, x2, y, null, color, false);
           }