diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
index 7757a9604cc..340a7aefdf4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.search.EverythingGlobalScope;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.util.containers.ContainerUtil;
@@ -98,14 +99,14 @@ public class SourceNavigationHelper {
         if (libraryFile == null) return GlobalSearchScope.EMPTY_SCOPE;
 
         boolean includeLibrarySources = navigationKind == NavigationKind.CLASS_FILES_TO_SOURCES;
-        if (ProjectRootsUtil.isInContent(declaration, false, includeLibrarySources, !includeLibrarySources)) {
+        if (ProjectRootsUtil.isInContent(declaration, false, includeLibrarySources, !includeLibrarySources, true)) {
             return GlobalSearchScope.EMPTY_SCOPE;
         }
 
         Project project = declaration.getProject();
         return includeLibrarySources
-               ? KotlinSourceFilterScope.librarySources(GlobalSearchScope.allScope(project), project)
-               : KotlinSourceFilterScope.libraryClassFiles(GlobalSearchScope.allScope(project), project);
+               ? KotlinSourceFilterScope.librarySources(new EverythingGlobalScope(project), project)
+               : KotlinSourceFilterScope.libraryClassFiles(new EverythingGlobalScope(project), project);
     }
 
     private static List<KtFile> getContainingFiles(@NotNull Iterable<KtNamedDeclaration> declarations) {
@@ -448,7 +449,7 @@ public class SourceNavigationHelper {
                 break;
             case SOURCES_TO_CLASS_FILES:
                 if (from.getContainingKtFile().isCompiled()) return from;
-                if (!ProjectRootsUtil.isInContent(from, false, true, false)) return from;
+                if (!ProjectRootsUtil.isInContent(from, false, true, false, true)) return from;
                 if (KtPsiUtil.isLocal(from)) return from;
                 break;
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt
index 8b2df1929d3..7f1b59a1ecc 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt
@@ -17,12 +17,11 @@
 package org.jetbrains.kotlin.idea.decompiler.navigation
 
 import com.intellij.openapi.project.Project
-import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.search.EverythingGlobalScope
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledTextIndexer
-import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager
 import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
 import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex
@@ -77,11 +76,7 @@ private fun findCandidateDeclarationsInIndex(
         project: Project,
         referencedDescriptor: DeclarationDescriptor
 ): Collection<KtDeclaration?> {
-    val libraryClassFilesScope = KotlinSourceFilterScope.libraryClassFiles(GlobalSearchScope.allScope(project), project)
-    // NOTE: using this scope here and getNoScopeWrap below is hopefully temporary and will be removed after refactoring
-    //   of searching logic
-    val scriptsScope = KotlinScriptConfigurationManager.getInstance(project).getAllScriptsClasspathScope()
-    val scope = scriptsScope?.let { GlobalSearchScope.union( arrayOf(libraryClassFilesScope, it)) } ?: libraryClassFilesScope
+    val scope = KotlinSourceFilterScope.libraryClassFiles(EverythingGlobalScope(project), project)
 
     val containingClass = DescriptorUtils.getParentOfType(referencedDescriptor, ClassDescriptor::class.java, false)
     if (containingClass != null) {