diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeBuilder.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeBuilder.java
index a69324557535..f082917e1331 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeBuilder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileTreeBuilder.java
@@ -11,6 +11,7 @@ import com.intellij.openapi.fileChooser.FileElement;
 import com.intellij.openapi.fileChooser.ex.RootFileElement;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.util.StatusBarProgress;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.vfs.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -87,7 +88,14 @@ public class FileTreeBuilder extends AbstractTreeBuilder {
   }
 
   protected boolean isAutoExpandNode(NodeDescriptor nodeDescriptor) {
-    return nodeDescriptor.getElement() instanceof RootFileElement;
+    if (nodeDescriptor.getElement() instanceof RootFileElement) {
+      return true;
+    } else if (!SystemInfo.isWindows) {
+      NodeDescriptor parent = nodeDescriptor.getParentDescriptor();
+      return parent != null && parent.getElement() instanceof RootFileElement;
+    }
+
+    return false;
   }
 
   @NotNull