diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
index e67b253adb36..8f933bc5bdf8 100644
--- a/java/java-tests/java-tests.iml
+++ b/java/java-tests/java-tests.iml
@@ -46,5 +46,6 @@
     <orderEntry type="module" module-name="spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="util-tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
+    <orderEntry type="module" module-name="jetgroovy" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy b/java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy
index 436c29509505..5e1de973f184 100644
--- a/java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy
@@ -27,6 +27,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import com.intellij.util.Consumer
 import com.intellij.util.concurrency.Semaphore
 import org.jetbrains.annotations.NotNull
+import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
 /**
  * @author peter
  */
@@ -287,6 +288,15 @@ class Intf {
     assert getPopupElements(new GotoSymbolModel2(project), 'Su.xpai', false) == [sub]
   }
 
+  public void "test groovy script class with non-identifier name"() {
+    GroovyFile file1 = myFixture.addFileToProject('foo.groovy', '')
+    myFixture.addFileToProject('foo-bar.groovy', '')
+
+    def clazz
+    edt { clazz = file1.scriptClass }
+    assert getPopupElements(new GotoSymbolModel2(project), 'foo', false) == [clazz]
+  }
+
   private List<Object> getPopupElements(ChooseByNameModel model, String text, boolean checkboxState = false) {
     return calcPopupElements(createPopup(model), text, checkboxState)
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
index 38c284646e22..0a662598e680 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
@@ -96,18 +96,20 @@ public class GotoSymbolModel2 extends FilteringGotoByModel<Language> {
     for(ChooseByNameContributor c: getContributors()) {
       if (c instanceof GotoClassContributor) {
         String result = ((GotoClassContributor) c).getQualifiedName((NavigationItem) element);
-        if (result != null) return result;
+        if (result != null) {
+          return result;
+        }
       }
     }
 
+    String elementName = getElementName(element);
+    if (elementName == null) return null;
+    
     if (element instanceof PsiElement) {
-      final PsiElement psiElement = (PsiElement)element;
-
-      final String containerText = SymbolPresentationUtil.getSymbolContainerText(psiElement);
-      return containerText + "." + getElementName(element);
+      return SymbolPresentationUtil.getSymbolContainerText((PsiElement)element) + "." + elementName;
     }
 
-    return getElementName(element);
+    return elementName;
   }
 
   @Override