diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
index 11a7d3f76cdd..e4c5bd885758 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
@@ -43,7 +43,7 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr
     return myPsiElement;
   }
 
-  protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, final ConfigurationContext context) {
+  public RunnerAndConfigurationSettings createConfigurationByElement(Location location, final ConfigurationContext context) {
     location = JavaExecutionUtil.stepIntoSingleClass(location);
     if (location == null) return null;
     final PsiElement element = location.getPsiElement();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
index 0fd10e685ae0..b7aea262ef1e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
@@ -43,7 +43,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import com.intellij.psi.util.PsiMethodUtil;
 import com.intellij.util.PathUtil;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.hash.HashMap;
@@ -246,7 +245,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
       throw new RuntimeConfigurationWarning(GroovyBundle.message("class.does.not.exist"));
     }
     if (toRun instanceof GrTypeDefinition) {
-      if (!GroovyScriptRunConfigurationProducer.isRunnable(toRun) && !PsiMethodUtil.hasMainMethod(toRun)) {
+      if (!GroovyScriptRunConfigurationProducer.canBeRunByGroovy(toRun)) {
         throw new RuntimeConfigurationWarning(GroovyBundle.message("class.can't be executed"));
       }
     }
@@ -297,7 +296,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
 
   @Override
   public void setProgramParameters(@Nullable String value) {
-    LOG.assertTrue(false, "Don't add program parameters to Groovy script run configuration. Use Script parameters instead");
+    LOG.error("Don't add program parameters to Groovy script run configuration. Use Script parameters instead");
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
index f7ab6d15a5cc..b97e70401e3e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
@@ -20,6 +20,7 @@ import com.intellij.execution.Location;
 import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.actions.ConfigurationContext;
+import com.intellij.execution.application.ApplicationConfigurationProducer;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunConfigurationModule;
 import com.intellij.execution.junit.RuntimeConfigurationProducer;
@@ -28,12 +29,11 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiMethodUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.extensions.GroovyScriptTypeDetector;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
-import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifier;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
 
@@ -47,31 +47,19 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
     super(GroovyScriptRunConfigurationType.getInstance());
   }
 
-  @Nullable
-  static PsiMethod findRun(PsiElement element) {
-    PsiMethod method;
-    while ((method = PsiTreeUtil.getParentOfType(element, PsiMethod.class)) != null) {
-      if (isRun(method)) {
-        return method;
-      }
-      else {
-        element = method.getParent();
-      }
+  public static boolean canBeRunByGroovy(final PsiClass psiClass) {
+    if (isRunnable(psiClass)) {
+      return true;
     }
-    return null;
+
+    if (PsiMethodUtil.hasMainMethod(psiClass) && psiClass instanceof GrTypeDefinition) {
+      return true;
+    }
+    
+    return false;
   }
 
-  static boolean isRun(PsiMethod method) {
-    final PsiParameter[] parameters = method.getParameterList().getParameters();
-    return "run".equals(method.getName()) &&
-           parameters.length == 0 &&
-           !method.hasModifierProperty(GrModifier.STATIC) &&
-           method.hasModifierProperty(GrModifier.PUBLIC) &&
-           (method.getModifierList().hasExplicitModifier(GrModifier.DEF) && ((GrMethod)method).getReturnTypeElementGroovy() == null ||
-            PsiType.VOID.equals(method.getReturnType()));
-  }
-
-  public static boolean isRunnable(final PsiClass psiClass) {
+  private static boolean isRunnable(final PsiClass psiClass) {
     if (!(psiClass instanceof GrTypeDefinition)) return false;
     if (psiClass instanceof PsiAnonymousClass) return false;
     if (psiClass.isInterface()) return false;
@@ -87,23 +75,6 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
     return false;
   }
 
-  @Nullable
-  public static PsiClass getRunnableClass(PsiElement element) {
-    while (element != null) {
-      if (element instanceof GrTypeDefinition) {
-        if (isRunnable((PsiClass)element)) return (PsiClass)element;
-      }
-      else if (element instanceof GroovyFile) {
-        final PsiClass[] classes = ((GroovyFile)element).getClasses();
-        for (PsiClass aClass : classes) {
-          if (isRunnable(aClass)) return aClass;
-        }
-      }
-      element = element.getParent();
-    }
-    return null;
-  }
-
   public PsiElement getSourceElement() {
     return mySourceElement;
   }
@@ -127,21 +98,18 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
         return settings;
       }
     }
+    
+    if (!file.getText().contains("@Grab")) return null;
 
-    PsiElement currentElement = element;
-    PsiMethod method;
-    while ((method = findRun(currentElement)) != null) {
-      final PsiClass aClass = method.getContainingClass();
-      if (isRunnable(aClass)) {
-        mySourceElement = method;
-        return createConfiguration(aClass);
-      }
-      currentElement = method.getParent();
+    ApplicationConfigurationProducer producer = new ApplicationConfigurationProducer();
+    RunnerAndConfigurationSettings settings = producer.createConfigurationByElement(location, context);
+    if (settings != null) {
+      PsiElement src = producer.getSourceElement();
+      mySourceElement = src;
+      return createConfiguration(src instanceof PsiMethod ? ((PsiMethod) src).getContainingClass() : (PsiClass)src);
     }
-    final PsiClass aClass = getRunnableClass(element);
-    if (aClass == null) return null;
-    mySourceElement = aClass;
-    return createConfiguration(aClass);
+
+    return null;
   }
 
   @Override
@@ -154,10 +122,11 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
       final String path = existing.getScriptPath();
       if (path != null) {
         final PsiFile file = location.getPsiElement().getContainingFile();
-        if (file instanceof GroovyFile && ((GroovyFile)file).isScript()) {
+        if (file instanceof GroovyFile) {
           final VirtualFile vfile = file.getVirtualFile();
           if (vfile != null && FileUtil.toSystemIndependentName(path).equals(vfile.getPath())) {
-            if (GroovyScriptTypeDetector.getScriptType((GroovyFile)file).isConfigurationByLocation(existing, location)) {
+            if (!((GroovyFile)file).isScript() ||
+                GroovyScriptTypeDetector.getScriptType((GroovyFile)file).isConfigurationByLocation(existing, location)) {
               return existingConfiguration;
             }
           }