diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
index 6e00723653a6..d7ba93b430ae 100644
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
@@ -66,7 +66,8 @@ public class ClassesTreeStructureProvider implements SelectableTreeStructureProv
 
         PsiClass[] classes = classOwner.getClasses();
         if (fileInRoots(file)) {
-          if (classes.length == 1 && !(classes[0] instanceof SyntheticElement)) {
+          if (classes.length == 1 && !(classes[0] instanceof SyntheticElement) &&
+              (file == null || file.getNameWithoutExtension().equals(classes[0].getName()))) {
             result.add(new ClassTreeNode(myProject, classes[0], settings1));
           } else {
             result.add(new PsiClassOwnerTreeNode(classOwner, settings1));