diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java b/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java
index 0266d1200bd9..85b74fbe85a1 100644
--- a/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java
+++ b/platform/analysis-api/src/com/intellij/psi/search/scope/ProblemsScope.java
@@ -6,10 +6,14 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.problems.WolfTheProblemSolver;
+import com.intellij.psi.search.scope.packageSet.CustomScopesProvider;
 import com.intellij.psi.search.scope.packageSet.NamedScope;
 import com.intellij.psi.search.scope.packageSet.FilteredPackageSet;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author Sergey Malenkov
  */
@@ -26,4 +30,12 @@ public final class ProblemsScope extends NamedScope {
       }
     });
   }
+
+  public static final class Provider implements CustomScopesProvider {
+    @NotNull
+    @Override
+    public List<NamedScope> getCustomScopes() {
+      return Collections.singletonList(INSTANCE);
+    }
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java b/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java
index 64539c3c4245..8f76db83e2a9 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/DefaultScopesProvider.java
@@ -31,7 +31,6 @@ public class DefaultScopesProvider extends CustomScopesProviderEx {
   public DefaultScopesProvider(@NotNull Project project) {
     myProject = project;
     myScopes = Arrays.asList(ProjectFilesScope.INSTANCE,
-                             ProblemsScope.INSTANCE,
                              getAllScope(),
                              NonProjectFilesScope.INSTANCE,
                              new ScratchesNamedScope());
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 93dca12c70bb..96c8202a69e9 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -486,6 +486,7 @@
 
     <patternDialectProvider implementation="com.intellij.packageDependencies.ui.ProjectPatternProvider" id="file"/>
     <customScopesProvider implementation="com.intellij.packageDependencies.DefaultScopesProvider"/>
+    <customScopesProvider implementation="com.intellij.psi.search.scope.ProblemsScope$Provider" order="last"/>
     <customScopesProvider implementation="com.intellij.packageDependencies.ChangeListsScopesProvider" order="last"/>
     <refactoring.elementListenerProvider implementation="com.intellij.packageDependencies.ui.RefactoringScopeElementListenerProvider"/>