diff --git a/platform/platform-api/src/com/intellij/ui/components/JBViewport.java b/platform/platform-api/src/com/intellij/ui/components/JBViewport.java
index f81797f5e5a8..31293c954ad0 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBViewport.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBViewport.java
@@ -272,7 +272,7 @@ public class JBViewport extends JViewport implements ZoomableViewport {
 
   private static void updateBorder(Component view) {
     if (view instanceof JTable) return; // tables are not supported yet
-    if (view instanceof JComponent) {
+    if (view instanceof JList || view instanceof JTree || view instanceof JComponent && Registry.is("ide.scroll.align.component")) {
       JComponent component = (JComponent)view;
       Border border = component.getBorder();
       if (border instanceof ViewBorder) return; // already set
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 15535b334514..71ab7efa478b 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -109,6 +109,7 @@ ide.tree.deferred.icon.invalidates.cache=true
 ide.splitter.mouseZone=6
 ide.smart.horizontal.scrolling=true
 ide.scroll.new.layout=true
+ide.scroll.align.component=false
 ide.scroll.background.auto=false
 ide.scroll.bar.expand.animation=false
 ide.scroll.track.border.paint=false