diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
index 55b0a55b2698..a3852d4ca0b7 100644
--- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
@@ -361,7 +361,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
           RunnerAndConfigurationSettings config = getValue();
           RunManager.getInstance(project).setSelectedConfiguration(config);
           MacroManager.getInstance().cacheMacrosPreview(context);
-          ExecutionUtil.runConfiguration(config, executor);
+          ExecutionUtil.doRunConfiguration(config, executor, null, null, context);
         }
 
         @Override
@@ -1101,7 +1101,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
         @Override
         public void perform(@NotNull final Project project, @NotNull final Executor executor, @NotNull DataContext context) {
           ExecutionTargetManager.setActiveTarget(project, getValue());
-          ExecutionUtil.runConfiguration(selectedConfiguration, executor);
+          ExecutionUtil.doRunConfiguration(selectedConfiguration, executor, null, null, context);
         }
 
         @Override
@@ -1142,7 +1142,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
           ApplicationManager.getApplication().invokeLater(() -> {
             RunnerAndConfigurationSettings configuration = RunManager.getInstance(project).getSelectedConfiguration();
             if (configuration != null) {
-              ExecutionUtil.runConfiguration(configuration, executor);
+              ExecutionUtil.doRunConfiguration(configuration, executor, null, null, context);
             }
           }, project.getDisposed());
         }
@@ -1179,7 +1179,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
     int i = 2; // selectedConfiguration == null ? 1 : 2;
     for (final ConfigurationFromContext fromContext : producers) {
       final RunnerAndConfigurationSettings configuration = fromContext.getConfigurationSettings();
-      if (existing.keySet().contains(configuration)) {
+      if (existing.containsKey(configuration)) {
         final ItemWrapper wrapper = existing.get(configuration);
         if (wrapper.getMnemonic() != 1) {
           wrapper.setMnemonic(i);
@@ -1214,7 +1214,7 @@ public class ChooseRunConfigurationPopup implements ExecutorProvider {
           public void perform(@NotNull Project project, @NotNull Executor executor, @NotNull DataContext context) {
             manager.setTemporaryConfiguration(configuration);
             RunManager.getInstance(project).setSelectedConfiguration(configuration);
-            ExecutionUtil.runConfiguration(configuration, executor);
+            ExecutionUtil.doRunConfiguration(configuration, executor, null, null, context);
           }
 
           @Override