diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java
index 090127ed076d..a906c017c143 100644
--- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileServiceImpl.java
@@ -282,8 +282,8 @@ public class ScratchFileServiceImpl extends ScratchFileService implements Persis
       if (virtualFile == null || !virtualFile.isValid()) return null;
       RootType rootType = ScratchFileService.getInstance().getRootType(virtualFile);
       if (rootType == null) return null;
-      if (virtualFile.isDirectory()) {
-        return additionalRoots(project).contains(virtualFile) ? rootType.getDisplayName() : null;
+      if (virtualFile.isDirectory() && additionalRoots(project).contains(virtualFile)) {
+        return rootType.getDisplayName();
       }
       return rootType.substituteName(project, virtualFile);
     }