diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
index 1e3aa3beeade..a6eefd49bd37 100644
--- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
@@ -258,7 +258,7 @@ public class ProjectStartupConfigurable implements SearchableConfigurable, Confi
   }
 
   private void addConfiguration(RunnerAndConfigurationSettings configuration) {
-    if (!ProjectStartupRunner.canRun(DefaultRunExecutor.getRunExecutorInstance(), configuration)) {
+    if (!ProjectStartupRunner.canBeRun(configuration)) {
       final String message = "Can not add Run Configuration '" + configuration.getName() + "' to Startup Tasks," +
                              " since it can not be started with 'Run' action.";
       final Balloon balloon = JBPopupFactory.getInstance()
@@ -290,7 +290,7 @@ public class ProjectStartupConfigurable implements SearchableConfigurable, Confi
     for (ChooseRunConfigurationPopup.ItemWrapper setting : allSettings) {
       if (setting.getValue() instanceof RunnerAndConfigurationSettings) {
         final RunnerAndConfigurationSettings settings = (RunnerAndConfigurationSettings)setting.getValue();
-        if (!settings.isTemporary() && ProjectStartupRunner.canRun(executor, settings) && !existing.contains(settings)) {
+        if (!settings.isTemporary() && ProjectStartupRunner.canBeRun(settings) && !existing.contains(settings)) {
           wrappers.add(setting);
         }
       }
diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java
index 4cf7083a4598..6222a392017f 100644
--- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java
+++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java
@@ -89,7 +89,7 @@ public class ProjectStartupRunner implements StartupActivity {
       ApplicationManager.getApplication().invokeLater(new Runnable() {
         @Override
         public void run() {
-          if (! canRun(executor, configuration)) {
+          if (! canBeRun(configuration)) {
             ProjectStartupTaskManager.NOTIFICATION_GROUP
               .createNotification(ProjectStartupTaskManager.PREFIX + " Run Configuration '" + configuration.getName() + "' can not be started with Run executor.", MessageType.ERROR)
               .notify(project);
@@ -104,7 +104,7 @@ public class ProjectStartupRunner implements StartupActivity {
     }
   }
 
-  public static boolean canRun(Executor executor, RunnerAndConfigurationSettings configuration) {
-    return RunnerRegistry.getInstance().getRunner(executor.getId(), configuration.getConfiguration()) != null;
+  public static boolean canBeRun(@NotNull RunnerAndConfigurationSettings configuration) {
+    return RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, configuration.getConfiguration()) != null;
   }
 }