diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProvider.java b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProvider.java
index 679ad29d2d60..9666f729b1fb 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProvider.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProvider.java
@@ -203,7 +203,10 @@ public class BuildArtifactsBeforeRunTaskProvider extends BeforeRunTaskProvider<B
     return result.get();
   }
 
-  public static void setBuildArtifactBeforeRunOption(@NotNull JComponent runConfigurationEditorComponent, @NotNull Artifact artifact, final boolean enable) {
+  public static void setBuildArtifactBeforeRunOption(@NotNull JComponent runConfigurationEditorComponent,
+                                                     Project project,
+                                                     @NotNull Artifact artifact,
+                                                     final boolean enable) {
     final DataContext dataContext = DataManager.getInstance().getDataContext(runConfigurationEditorComponent);
     final ConfigurationSettingsEditorWrapper editor = ConfigurationSettingsEditorWrapper.CONFIGURATION_EDITOR_KEY.getData(dataContext);
     if (editor != null) {
@@ -214,15 +217,23 @@ public class BuildArtifactsBeforeRunTaskProvider extends BeforeRunTaskProvider<B
           myTasks.add((BuildArtifactsBeforeRunTask)task);
         }
       }
-      for (BuildArtifactsBeforeRunTask task : myTasks) {
-        if (enable) {
-          task.addArtifact(artifact);
-          task.setEnabled(true);
-        }
-        else {
-          task.removeArtifact(artifact);
-          if (task.getArtifactPointers().isEmpty()) {
-            task.setEnabled(false);
+      if (enable && myTasks.isEmpty()) {
+        BuildArtifactsBeforeRunTask task = new BuildArtifactsBeforeRunTask(project);
+        task.addArtifact(artifact);
+        task.setEnabled(true);
+        editor.addBeforeLaunchStep(task);
+      }
+      else {
+        for (BuildArtifactsBeforeRunTask task : myTasks) {
+          if (enable) {
+            task.addArtifact(artifact);
+            task.setEnabled(true);
+          }
+          else {
+            task.removeArtifact(artifact);
+            if (task.getArtifactPointers().isEmpty()) {
+              task.setEnabled(false);
+            }
           }
         }
       }
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java b/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java
index 6633ba76864d..e37a2642e38e 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java
@@ -302,7 +302,7 @@ class BeforeRunStepsPanel extends DropDownPanel {
                                             ExecutionBundle.message("warning.common.title"),JOptionPane.WARNING_MESSAGE);
               return;
             }
-            myModel.add(task);
+            addTask(task);
             myListener.fireStepsBeforeRunChanged();
           }
         };
@@ -315,6 +315,10 @@ class BeforeRunStepsPanel extends DropDownPanel {
       popup.show(button.getPreferredPopupPoint());
   }
 
+  public void addTask(BeforeRunTask task) {
+    myModel.add(task);
+  }
+
   private Set<Key> getActiveProviderKeys() {
     Set<Key> result = new HashSet<Key>();
     for (BeforeRunTask task : myModel.getItems()) {
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 98cb78213b4b..d559d6b499fd 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
@@ -103,6 +103,10 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
     }
   }
 
+  public void addBeforeLaunchStep(BeforeRunTask<?> task) {
+    myBeforeRunStepsPanel.addTask(task);
+  }
+
   public List<BeforeRunTask> getStepsBeforeLaunch() {
     return Collections.unmodifiableList(myBeforeRunStepsPanel.getTasks(true));
   }