diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index 85a5b51e1337..52a705e3841f 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -138,8 +138,9 @@ public class JavaExecutionUtil {
     final PsiManager psiManager = PsiManager.getInstance(project);
     final String shortName = StringUtil.getShortName(mainClassName);
     final String packageName = StringUtil.getPackageName(mainClassName);
-    return JavaPsiFacade.getInstance(psiManager.getProject())
-      .findClass(StringUtil.getQualifiedName(packageName, shortName.replace('$', '.')), scope);
+    final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(psiManager.getProject());
+    final PsiClass psiClass = psiFacade.findClass(StringUtil.getQualifiedName(packageName, shortName.replace('$', '.')), scope);
+    return psiClass == null ? psiFacade.findClass(mainClassName, scope) : psiClass;
   }