diff --git a/platform/platform-api/src/com/intellij/ui/components/WideSelectionListUI.java b/platform/platform-api/src/com/intellij/ui/components/WideSelectionListUI.java
index c68e3edd3913..46c227c45b27 100644
--- a/platform/platform-api/src/com/intellij/ui/components/WideSelectionListUI.java
+++ b/platform/platform-api/src/com/intellij/ui/components/WideSelectionListUI.java
@@ -56,7 +56,7 @@ public final class WideSelectionListUI extends BasicListUI {
       }
     }
     super.paintCell(g, row, rowBounds, renderer, model, selectionModel, leadSelectionIndex);
-    if (!selected && row == leadSelectionIndex && g instanceof Graphics2D) {
+    if (!selected && row == leadSelectionIndex && g instanceof Graphics2D && list.hasFocus()) {
       g.setColor(UIUtil.getListSelectionBackground(true));
       if (JList.VERTICAL == list.getLayoutOrientation()) {
         int viewportX = 0;
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 28b1fe17da4e..6ad82d0dab70 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
@@ -238,7 +238,7 @@ public final class DefaultTreeUI extends BasicTreeUI {
                 rendererPane.paintComponent(g, component, tree, insets.left + offset, bounds.y, width, bounds.height, true);
               }
             }
-            if (!selected && lead && g instanceof Graphics2D) {
+            if (!selected && lead && focused && g instanceof Graphics2D) {
               g.setColor(getBackground(tree, path, row, true));
               DRAW.paint((Graphics2D)g, viewportX, bounds.y, viewportWidth, bounds.height, 0);
             }