diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 58b7d5d8fa12..12459910c183 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -657,6 +657,7 @@
     <psi.referenceContributor implementation="org.jetbrains.plugins.groovy.transformations.impl.synch.SynchronizedReferenceContributor"/>
 
     <resolveScopeProvider implementation="org.jetbrains.plugins.groovy.lang.resolve.GroovyResolveScopeProvider"/>
+    <resolveScopeProvider implementation="org.jetbrains.plugins.groovy.bundled.BundledGroovyResolveScopeProvider"/>
 
     <java.elementFinder implementation="org.jetbrains.plugins.groovy.lang.psi.impl.javaView.GroovyClassFinder"/>
     <java.elementFinder implementation="org.jetbrains.plugins.groovy.lang.psi.impl.javaView.GroovyLightInnerClassFinder"/>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyResolveScopeProvider.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyResolveScopeProvider.kt
new file mode 100644
index 000000000000..d06051131a0c
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/bundled/BundledGroovyResolveScopeProvider.kt
@@ -0,0 +1,30 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.plugins.groovy.bundled
+
+import com.intellij.openapi.module.impl.scopes.JdkScope
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.OrderRootType
+import com.intellij.openapi.roots.ProjectFileIndex
+import com.intellij.openapi.roots.ProjectRootManager
+import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.ResolveScopeProvider
+import com.intellij.psi.search.GlobalSearchScope
+
+class BundledGroovyResolveScopeProvider : ResolveScopeProvider() {
+
+  override fun getResolveScope(file: VirtualFile, project: Project): GlobalSearchScope? {
+    val index = ProjectFileIndex.SERVICE.getInstance(project)
+    index.getModuleForFile(file)?.let { return null }
+
+    val rootFile = VfsUtil.getRootFile(file)
+    if (rootFile == bundledGroovyJarRoot) {
+      val scope = createBundledGroovyScope(project) ?: return null
+      val sdk = ProjectRootManager.getInstance(project).projectSdk ?: return null
+      val jdkScope = JdkScope(project, sdk.rootProvider.getFiles(OrderRootType.CLASSES), sdk.rootProvider.getFiles(OrderRootType.SOURCES), sdk.name)
+
+     return scope.uniteWith(jdkScope)
+    }
+    return null
+  }
+}
\ No newline at end of file