diff --git a/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
index 3694e5b5ab31..14ca6137a177 100644
--- a/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
+++ b/platform/core-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
@@ -114,4 +114,8 @@ public class DelegatingGlobalSearchScope extends GlobalSearchScope {
   public GlobalSearchScope getDelegate() {
     return myBaseScope;
   }
+  
+  public GlobalSearchScope unwrap() {
+    return myBaseScope instanceof DelegatingGlobalSearchScope ? ((DelegatingGlobalSearchScope)myBaseScope).unwrap() : myBaseScope;
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
index 08a6c460a997..f0874eaaef05 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
@@ -777,7 +777,7 @@ public final class FileBasedIndexImpl extends FileBasedIndexEx {
       return true; //indexed eagerly in foreground while building unindexed file list
     }
     if (filter == GlobalSearchScope.EMPTY_SCOPE || 
-        filter instanceof DelegatingGlobalSearchScope && ((DelegatingGlobalSearchScope)filter).getDelegate() == GlobalSearchScope.EMPTY_SCOPE) {
+        filter instanceof DelegatingGlobalSearchScope && ((DelegatingGlobalSearchScope)filter).unwrap() == GlobalSearchScope.EMPTY_SCOPE) {
       return false;
     }
     if (project == null) {