diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
index 714bc7a2317f..db6ea1442367 100644
--- a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
+++ b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
@@ -48,8 +48,6 @@ public abstract class RunManagerEx extends RunManager {
 
   public abstract void setTemporaryConfiguration(@Nullable RunnerAndConfigurationSettings tempConfiguration);
 
-  public abstract void setEditBeforeRun(RunConfiguration settings, boolean edit);
-
   public abstract RunManagerConfig getConfig();
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
index dd93b12e5e12..7d1d7a436db0 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
@@ -116,7 +116,12 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
     final RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(runConfiguration.getProject());
     runManager.setBeforeRunTasks(runConfiguration, myBeforeRunStepsPanel.getTasks(true));
     runManager.shareConfiguration(runConfiguration, myStoreProjectConfiguration);
-    runManager.setEditBeforeRun(runConfiguration, myBeforeRunStepsPanel.needEditBeforeRun());
+    RunnerAndConfigurationSettings runManagerSettings = runManager.getSettings(runConfiguration);
+    if (runManagerSettings != null) {
+      runManagerSettings.setEditBeforeRun(myBeforeRunStepsPanel.needEditBeforeRun());
+    } else {
+      settings.setEditBeforeRun(myBeforeRunStepsPanel.needEditBeforeRun());
+    }
   }
 
   public List<BeforeRunTask> getStepsBeforeLaunch() {
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
index ca49a0227f8e..f5b7eea5f973 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
@@ -653,11 +653,6 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable,
     return configuration.isEditBeforeRun();
   }
 
-  public void setEditBeforeRun(@NotNull final RunConfiguration configuration, final boolean edit) {
-    final RunnerAndConfigurationSettings settings = getSettings(configuration);
-    if (settings != null) settings.setEditBeforeRun(edit);
-  }
-
   Collection<RunnerAndConfigurationSettings> getStableConfigurations() {
     final Map<Integer, RunnerAndConfigurationSettings> result =
       new LinkedHashMap<Integer, RunnerAndConfigurationSettings>(myConfigurations);
diff --git a/platform/testFramework/src/com/intellij/mock/MockRunManager.java b/platform/testFramework/src/com/intellij/mock/MockRunManager.java
index 26cfb96470ab..4f47bbd45014 100644
--- a/platform/testFramework/src/com/intellij/mock/MockRunManager.java
+++ b/platform/testFramework/src/com/intellij/mock/MockRunManager.java
@@ -84,10 +84,6 @@ public class MockRunManager extends RunManagerEx {
   public void setTemporaryConfiguration(RunnerAndConfigurationSettings tempConfiguration) {
   }
 
-  @Override
-  public void setEditBeforeRun(RunConfiguration settings, boolean edit) {
-  }
-
   @Override
   public RunManagerConfig getConfig() {
     return null;