diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleConfigurableWrapper.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleConfigurableWrapper.java
index 6d37e0b5bd02..490d71192efc 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleConfigurableWrapper.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleConfigurableWrapper.java
@@ -118,7 +118,7 @@ public class CodeStyleConfigurableWrapper
   @Override
   @NotNull
   public String getId() {
-    return "preferences.sourceCode." + getDisplayName();
+    return getConfigurableId(getDisplayName());
   }
 
   @Override
@@ -149,4 +149,9 @@ public class CodeStyleConfigurableWrapper
     }
     return myPanel.processListOptions();
   }
+
+  @NotNull
+  public static String getConfigurableId(String configurableDisplayName) {
+    return "preferences.sourceCode." + configurableDisplayName;
+  }
 }
diff --git a/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java b/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java
index 9593c4626ee1..2a9795c64d80 100644
--- a/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java
+++ b/xml/impl/src/com/intellij/application/options/HtmlCodeStyleSettingsProvider.java
@@ -25,10 +25,13 @@ import org.jetbrains.annotations.NotNull;
  * @author yole
  */
 public class HtmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
+
+  public static final String DISPLAY_NAME = ApplicationBundle.message("title.html");
+
   @Override
   @NotNull
   public Configurable createSettingsPage(final CodeStyleSettings settings, final CodeStyleSettings originalSettings) {
-    return new CodeStyleAbstractConfigurable(settings, originalSettings, ApplicationBundle.message("title.html")) {
+    return new CodeStyleAbstractConfigurable(settings, originalSettings, DISPLAY_NAME) {
       @Override
       protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) {
         return new HtmlCodeStyleMainPanel(settings, originalSettings);
@@ -43,6 +46,6 @@ public class HtmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
 
   @Override
   public String getConfigurableDisplayName() {
-    return ApplicationBundle.message("title.html");
+    return DISPLAY_NAME;
   }
 }