diff --git a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
index 615edd73283c..b361b5be89cf 100644
--- a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
@@ -99,8 +99,26 @@ abstract public class AbstractExpandableItemsHandler<KeyType, ComponentType exte
         public void componentMoved(ComponentEvent e) {
           handleSelectionChange(myKey);
         }
+
+        @Override
+        public void componentResized(ComponentEvent e) {
+          handleSelectionChange(myKey);
+        }
       }
     );
+
+    myComponent.addHierarchyBoundsListener(new HierarchyBoundsAdapter() {
+      @Override
+      public void ancestorMoved(HierarchyEvent e) {
+        handleSelectionChange(myKey);
+      }
+
+      @Override
+      public void ancestorResized(HierarchyEvent e) {
+        handleSelectionChange(myKey);
+      }
+    });
+
     myComponent.addHierarchyListener(
       new HierarchyListener() {
         public void hierarchyChanged(HierarchyEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/ui/TreeExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/TreeExpandableItemsHandler.java
index 0c7ff85a2ab0..b78b1a847067 100644
--- a/platform/platform-impl/src/com/intellij/ui/TreeExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/TreeExpandableItemsHandler.java
@@ -156,12 +156,6 @@ public class TreeExpandableItemsHandler extends AbstractExpandableItemsHandler<I
     super.doFillBackground(ui instanceof UIUtil.MacTreeUI && ((UIUtil.MacTreeUI)ui).isWideSelection()? height - 1 : height, width, g);
   }
 
-  @Override
-  protected boolean doPaintBorder(final Integer row) {
-    final TreeUI ui = myComponent.getUI();
-    return (!(ui instanceof UIUtil.MacTreeUI) || !((UIUtil.MacTreeUI)ui).isWideSelection()) || !myComponent.isRowSelected(row);
-  }
-
   @Override
   protected void doPaintTooltipImage(final Component rComponent, final Rectangle cellBounds, final int height, final Graphics2D g, Integer key) {
     if (myComponent.isRowSelected(key) && rComponent instanceof JComponent) {