diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java
index f9f8c8bcad13..d1e8b1e1a54d 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java
@@ -151,11 +151,14 @@ public class BuildArtifactsBeforeRun implements BeforeRunTaskProvider<BuildArtif
       final BuildArtifactsBeforeRunTask task = (BuildArtifactsBeforeRunTask)editor.getStepsBeforeLaunch().get(ID);
       if (enable) {
         task.addArtifact(artifact);
+        task.setEnabled(true);
       }
       else {
         task.removeArtifact(artifact);
+        if (task.getArtifactPointers().isEmpty()) {
+          task.setEnabled(false);
+        }
       }
-      task.setEnabled(!task.getArtifactPointers().isEmpty());
       editor.updateBeforeRunTaskPanel(ID);
     }
   }