diff --git a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
index c5aca5569976..dc8d5992b46f 100644
--- a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
+++ b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
@@ -720,6 +720,13 @@ public final class TreeUtil {
 
     if (visible == null) return 0;
 
+    int rowHeight = tree.getRowHeight();
+    if (rowHeight > 0) {
+      int firstRow = visible.y / rowHeight;
+      int lastRow = (visible.y + visible.height) / rowHeight;
+      return lastRow - firstRow + 1;
+    }
+
     int count = 0;
     for (int i=0; i < tree.getRowCount(); i++) {
       final Rectangle bounds = tree.getRowBounds(i);