diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
index 9d90e112dd39..6bfee5149833 100644
--- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.*;
 import com.intellij.openapi.util.Trinity;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.messages.MessageBusConnection;
@@ -187,7 +188,6 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
       super.update(e);
 
       final Presentation presentation = e.getPresentation();
-      boolean enabled = false;
       final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
 
       if (project == null || !project.isInitialized() || project.isDisposed() || DumbService.getInstance(project).isDumb()) {
@@ -196,6 +196,8 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
       }
 
       final RunnerAndConfigurationSettings selectedConfiguration = getConfiguration(project);
+      boolean enabled = false;
+      String text;
       if (selectedConfiguration != null) {
         final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(myExecutor.getId(), selectedConfiguration.getConfiguration());
         enabled = runner != null && !isStarting(project, myExecutor.getId(), runner.getRunnerId());
@@ -203,9 +205,11 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
         if (enabled) {
           presentation.setDescription(myExecutor.getDescription());
         }
+        text = getTemplatePresentation().getTextWithMnemonic() + " '" + StringUtil.first(selectedConfiguration.getName(), 30, true) + "'";
+      }
+      else {
+        text = getTemplatePresentation().getTextWithMnemonic();
       }
-
-      String text = getTemplatePresentation().getTextWithMnemonic();
 
       presentation.setEnabled(enabled);
       presentation.setText(text);
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 56d2df77d851..aa039310b21b 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -8,8 +8,8 @@
     <group id="SendToFavoritesGroup" class="com.intellij.ide.favoritesTreeView.actions.SendToFavoritesGroup" popup="true"/>
 
     <action id="RunConfiguration" class="com.intellij.execution.actions.RunConfigurationAction"/>
-    <action id="ChooseRunConfiguration" class="com.intellij.execution.actions.ChooseRunConfigurationAction" text="Run..." icon="/general/toolWindowRun.png"/>
-    <action id="ChooseDebugConfiguration" class="com.intellij.execution.actions.ChooseDebugConfigurationAction" text="Debug..." icon="/general/debug.png"/>
+    <action id="ChooseRunConfiguration" class="com.intellij.execution.actions.ChooseRunConfigurationAction" text="Run..." description="Choose and run configuration" icon="/general/toolWindowRun.png"/>
+    <action id="ChooseDebugConfiguration" class="com.intellij.execution.actions.ChooseDebugConfigurationAction" text="Debug..." description="Choose and debug configuration" icon="/general/debug.png"/>
 
     <group id="RunContextGroup" popup="false">
       <action id="CreateRunConfiguration" class="com.intellij.execution.actions.CreateAction"/>