diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
index a4b238aa72e2..c4292cd34b5a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
@@ -476,6 +476,7 @@ public final class LafManagerImpl extends LafManager implements PersistentStateC
 
     patchLafFonts(uiDefaults);
 
+    patchListUI(uiDefaults);
     patchTreeUI(uiDefaults);
 
     patchHiDPI(uiDefaults);
@@ -535,7 +536,18 @@ public final class LafManagerImpl extends LafManager implements PersistentStateC
     defaults.put("PasswordField.font", defaults.getFont("TextField.font"));
   }
 
+  private static void patchBorder(UIDefaults defaults, String key) {
+    if (defaults.getBorder(key) == null) {
+      defaults.put(key, JBUI.Borders.empty(1, 0).asUIResource());
+    }
+  }
+
+  private static void patchListUI(UIDefaults defaults) {
+    patchBorder(defaults, "List.border");
+  }
+
   private static void patchTreeUI(UIDefaults defaults) {
+    patchBorder(defaults, "Tree.border");
     if (Registry.is("ide.tree.ui.experimental")) {
       defaults.put("TreeUI", "com.intellij.ui.tree.ui.DefaultTreeUI");
       defaults.put("Tree.repaintWholeRow", true);
diff --git a/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java b/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java
index ccf56d3653dc..25626ade25ef 100644
--- a/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java
+++ b/platform/platform-impl/src/com/intellij/ui/tree/ui/DefaultTreeUI.java
@@ -247,6 +247,7 @@ public final class DefaultTreeUI extends BasicTreeUI {
     super.installDefaults();
     JTree tree = getTree();
     if (tree != null) {
+      LookAndFeel.installBorder(tree, "Tree.border");
       if (tree.isForegroundSet()) tree.setForeground(null);
       if (UIManager.get("Tree.showsRootHandles") == null) {
         LookAndFeel.installProperty(tree, JTree.SHOWS_ROOT_HANDLES_PROPERTY, Boolean.TRUE);