diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt
new file mode 100644
index 00000000000..4d69ae5fdea
--- /dev/null
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.core.script.dependencies
+
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiClassOwner
+import com.intellij.psi.PsiElement
+import com.intellij.psi.impl.compiled.*
+import com.intellij.psi.util.MethodSignatureUtil
+import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager
+
+class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigationPolicyEx() {
+    override fun getNavigationElement(clsClass: ClsClassImpl): PsiClass? {
+        val containingClass = clsClass.containingClass as? ClsClassImpl
+        if (containingClass != null) {
+            return getNavigationElement(containingClass)?.findInnerClassByName(clsClass.name, false)
+        }
+
+        val clsFileImpl = clsClass.containingFile as? ClsFileImpl ?: return null
+        return getFileNavigationElement(clsFileImpl)?.classes?.singleOrNull()
+    }
+
+    override fun getNavigationElement(clsMethod: ClsMethodImpl): PsiElement? {
+        val clsClass = getNavigationElement(clsMethod.containingClass as ClsClassImpl) ?: return null
+        return clsClass.findMethodsByName(clsMethod.name, false)
+                .firstOrNull { MethodSignatureUtil.areParametersErasureEqual(it, clsMethod) }
+    }
+
+    override fun getNavigationElement(clsField: ClsFieldImpl): PsiElement? {
+        val srcClass = getNavigationElement(clsField.containingClass as ClsClassImpl) ?: return null
+        return srcClass.findFieldByName(clsField.name, false)
+    }
+
+    override fun getFileNavigationElement(file: ClsFileImpl): PsiClassOwner? {
+        val virtualFile = file.virtualFile
+        val project = file.project
+
+        val kotlinScriptConfigurationManager = KotlinScriptConfigurationManager.getInstance(project)
+        if (virtualFile !in kotlinScriptConfigurationManager.getAllScriptsClasspathScope()) return null
+
+        val sourceFileName = (file.classes.first() as ClsClassImpl).sourceFileName
+        val packageName = file.packageName
+        val relativePath = if (packageName.isEmpty()) sourceFileName else packageName.replace('.', '/') + '/' + sourceFileName
+
+        for (root in kotlinScriptConfigurationManager.getAllLibrarySources()) {
+            val sourceFile = root.findFileByRelativePath(relativePath)
+            if (sourceFile != null && sourceFile.isValid) {
+                val sourcePsi = file.manager.findFile(sourceFile)
+                if (sourcePsi is PsiClassOwner) {
+                    return sourcePsi
+                }
+            }
+        }
+        return null
+    }
+}
\ No newline at end of file
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index a4e1ead9492..679b33d4c8e 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1601,6 +1601,8 @@
     <java.shortNamesCache implementation="org.jetbrains.kotlin.idea.core.script.dependencies.JavaClassesInScriptDependenciesShortNameCache"/>
     <indexedRootsProvider implementation="org.jetbrains.kotlin.idea.core.script.dependencies.KotlinScriptDependenciesIndexableSetContributor"/>
 
+    <psi.clsCustomNavigationPolicy implementation="org.jetbrains.kotlin.idea.core.script.dependencies.ScriptDependencySourceNavigationPolicyForJavaClasses"/>
+
   </extensions>
 
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>