diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java
index ca32b665db66..4a3ac89bc030 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java
@@ -448,7 +448,7 @@ public final class EditorPainter implements TextDrawingCallback {
           boolean isSelection = result.second;
 
           myBetweenLinesAttributes.put(visualLine, attributes);
-          if (isSelection && shouldUseNewSelection() ) {
+          if (isSelection && shouldUseNewSelection()) {
             mySelectionLinePainter.paintAllBlockInlaysAbove(visualLine);
           } else {
             paintBackground(attributes, startX, prevY, endX - startX, y - prevY);
@@ -469,7 +469,7 @@ public final class EditorPainter implements TextDrawingCallback {
                 && it.isInSelection()
                 && myEditor.isRightAligned()) {
               mySelectionLinePainter.paintSelection(new Rectangle2D.Float(
-                startX - selectionExtensionWidth, y,
+                xEnd - selectionExtensionWidth, y,
                 selectionExtensionWidth, myLineHeight
               ));
             }