diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
index e4def48595bc..068546a24b1e 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
@@ -17,6 +17,7 @@ package com.intellij.openapi.ui;
 
 import com.intellij.CommonBundle;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
@@ -140,7 +141,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom
   }
 
   private boolean isNewProjectSettings() {
-    if (Registry.is("ide.new.settings.view")) {
+    if (ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")) {
       return true;
     }
     if (!Registry.is("ide.new.project.settings")) {
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
index b43e449dd2ef..d8237874e1c0 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
@@ -17,6 +17,7 @@ package com.intellij.ide.actions;
 
 import com.intellij.ide.ui.search.SearchUtil;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.*;
 import com.intellij.openapi.options.ex.*;
@@ -57,7 +58,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
     project = getProject(project);
     final ConfigurableGroup[] filteredGroups = filterEmptyGroups(groups);
     if (Registry.is("ide.new.settings.dialog")) {
-      return Registry.is("ide.new.settings.view")
+      return ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
              ? new SettingsDialog(project, filteredGroups, toSelect, null)
              : new IdeSettingsDialog(project, filteredGroups, toSelect);
     }
@@ -165,7 +166,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
     group = filterEmptyGroups(group);
     final Configurable configurable2Select = findConfigurable2Select(id2Select, group);
 
-    if (Registry.is("ide.new.settings.view")) {
+    if (ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")) {
       new SettingsDialog(getProject(project), group, configurable2Select, filter).show();
       return;
     }
@@ -278,12 +279,12 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
                                           boolean showApplyButton) {
     final DialogWrapper editor;
     if (parent == null) {
-      editor = Registry.is("ide.new.settings.view")
+      editor = ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
                ? new SettingsDialog(project, dimensionKey, configurable, showApplyButton)
                : new SingleConfigurableEditor(project, configurable, dimensionKey, showApplyButton);
     }
     else {
-      editor = Registry.is("ide.new.settings.view")
+      editor = ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
                ? new SettingsDialog(parent, dimensionKey, configurable, showApplyButton)
                : new SingleConfigurableEditor(parent, configurable, dimensionKey, showApplyButton);
     }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 53628fcec0ce..655792e0ddcb 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -417,7 +417,7 @@ console.too.much.text.buffer.ratio=10
 console.too.much.text.buffer.ratio.description=Used for disabling of console processing(console filters for highlights, foldings...),\n\
   when there is too much of text to process.\n\
   The ratio is used against the console cycle buffer size (idea.cycle.buffer.size/theRatio=maxTextLength).
-ide.new.settings.view=false
+ide.new.settings.view=true
 ide.new.settings.view.description=New view for the Settings dialog
 ide.new.settings.dialog=true
 ide.new.settings.dialog.description=New settings dialog