diff --git a/platform/lang-impl/src/com/intellij/psi/impl/search/NonPhysicalReferenceSearcher.java b/platform/lang-impl/src/com/intellij/psi/impl/search/NonPhysicalReferenceSearcher.java
index 43abc69579f1..b46a8c952559 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/search/NonPhysicalReferenceSearcher.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/search/NonPhysicalReferenceSearcher.java
@@ -26,7 +26,7 @@ public class NonPhysicalReferenceSearcher extends QueryExecutorBase<PsiReference
 
   public void processQuery(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull Processor<PsiReference> consumer) {
     if (ApplicationManager.getApplication().isUnitTestMode()) return;
-    final SearchScope scope = queryParameters.getScope();
+    final SearchScope scope = queryParameters.getScopeDeterminedByUser();
     final PsiElement element = queryParameters.getElementToSearch();
     final PsiFile containingFile = element.getContainingFile();
     final boolean isPhysical = containingFile == null || containingFile.getViewProvider().isPhysical();
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java
index d40be21e1786..e73583e0dfea 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java
@@ -50,7 +50,8 @@ import java.util.List;
 public class FormReferencesSearcher implements QueryExecutor<PsiReference, ReferencesSearch.SearchParameters> {
   @Override
   public boolean execute(@NotNull final ReferencesSearch.SearchParameters p, @NotNull final Processor<PsiReference> consumer) {
-    if (!scopeCanContainForms(p.getScope())) return true;
+    SearchScope userScope = p.getScopeDeterminedByUser();
+    if (!scopeCanContainForms(userScope)) return true;
     final PsiElement refElement = p.getElementToSearch();
     final PsiFile psiFile = ApplicationManager.getApplication().runReadAction(new Computable<PsiFile>() {
       @Override
@@ -71,9 +72,7 @@ public class FormReferencesSearcher implements QueryExecutor<PsiReference, Refer
     Module module = ProjectRootManager.getInstance(project).getFileIndex().getModuleForFile(virtualFile);
     if (module == null) return true;
     final GlobalSearchScope scope = GlobalSearchScope.moduleWithDependenciesScope(module);
-    final LocalSearchScope filterScope = p.getScope() instanceof LocalSearchScope
-                                         ? (LocalSearchScope) p.getScope()
-                                         : null;
+    final LocalSearchScope filterScope = userScope instanceof LocalSearchScope ? (LocalSearchScope)userScope : null;
 
     PsiManager psiManager = PsiManager.getInstance(project);
     if (refElement instanceof PsiPackage) {