2 files changed, 13 insertions, 6 deletions
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
index 0f39ab8a176c..e410895b087e 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
@@ -35,14 +35,18 @@ public class ToolConfigurable implements SearchableConfigurable, Configurable.No
 
   @Override
   public JComponent createComponent() {
-    myPanel = new ToolsPanel();
+    if (myPanel == null) {
+      myPanel = new ToolsPanel();
+    }
     return myPanel;
   }
 
   @Override
   public void apply() throws ConfigurationException {
     try {
-      myPanel.apply();
+      if (myPanel != null) {
+        myPanel.apply();
+      }
     }
     catch (IOException e) {
       throw new ConfigurationException(e.getMessage());
@@ -51,12 +55,14 @@ public class ToolConfigurable implements SearchableConfigurable, Configurable.No
 
   @Override
   public boolean isModified() {
-    return myPanel.isModified();
+    return myPanel != null && myPanel.isModified();
   }
 
   @Override
   public void reset() {
-    myPanel.reset();
+    if (myPanel != null) {
+      myPanel.reset();
+    }
   }
 
   @Override
@@ -73,7 +79,7 @@ public class ToolConfigurable implements SearchableConfigurable, Configurable.No
   @Override
   @NotNull
   public String getId() {
-    return getHelpTopic();
+    return "preferences.externalTools";
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolManager.java b/platform/lang-impl/src/com/intellij/tools/ToolManager.java
index 59a17bea67ed..0722090527bb 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolManager.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolManager.java
@@ -17,6 +17,7 @@ package com.intellij.tools;
 
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.openapi.options.SchemeProcessor;
 import com.intellij.openapi.options.SchemesManagerFactory;
 import org.jetbrains.annotations.NotNull;
@@ -32,7 +33,7 @@ public class ToolManager extends BaseToolManager<Tool> {
 
   @Override
   protected String getSchemesPath() {
-    return "$ROOT_CONFIG$/tools";
+    return StoragePathMacros.ROOT_CONFIG + "/tools";
   }
 
   @Override