diff --git a/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTaskProvider.java b/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTaskProvider.java
index da5e4777a134..faadc5d4b8d2 100644
--- a/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTaskProvider.java
+++ b/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTaskProvider.java
@@ -44,7 +44,9 @@ public abstract class AbstractToolBeforeRunTaskProvider<T extends AbstractToolBe
     }
     boolean isModified = dialog.isModified();
     Tool selectedTool = dialog.getSelectedTool();
-    LOG.assertTrue(selectedTool != null);
+    if (selectedTool == null) {
+      return true;
+    }
     String selectedToolId = selectedTool.getActionId();
     String oldToolId = task.getToolActionId();
     if (oldToolId != null && oldToolId.equals(selectedToolId)) {
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolSelectDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolSelectDialog.java
index 4f108ab42538..6d03dd1af724 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolSelectDialog.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolSelectDialog.java
@@ -20,8 +20,6 @@ import com.intellij.openapi.ui.DialogWrapper;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
 
 class ToolSelectDialog extends DialogWrapper {
   private final BaseToolsPanel myToolsPanel;
@@ -30,13 +28,6 @@ class ToolSelectDialog extends DialogWrapper {
     super(project);
     myToolsPanel = toolsPanel;
     myToolsPanel.reset();
-    setOKActionEnabled(myToolsPanel.getSingleSelectedTool() != null);
-    myToolsPanel.addSelectionListener(new TreeSelectionListener() {
-      @Override
-      public void valueChanged(TreeSelectionEvent e) {
-        setOKActionEnabled(myToolsPanel.getSingleSelectedTool() != null);
-      }
-    });
     init();
     pack();
     if (actionIdToSelect != null) {