diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java
index cd80e742a281..9d8279236a79 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffSideView.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.IJSwingUtilities;
 import com.intellij.util.ui.ScrollUtil;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -103,6 +104,7 @@ public class DiffSideView {
       applyHighlighter();
       setMouseListeners(source);
       MyEditorFocusListener.install(this);
+      UIUtil.removeScrollBorder(editor.getComponent());
 
       state.restore();
     }