diff --git a/platform/icons/src/debugger/disable_value_calculation.png b/platform/icons/src/debugger/disable_value_calculation.png
new file mode 100644
index 000000000000..4484d1b3e3de
Binary files /dev/null and b/platform/icons/src/debugger/disable_value_calculation.png differ
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java
index 84f20cbc1544..4afc1c2103f0 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java
@@ -36,7 +36,7 @@ public class DebuggerConfigurableProvider extends ConfigurableProvider {
       providers.add(support.getSettingsPanelProvider());
     }
 
-    final ArrayList<Configurable> configurables = new ArrayList<Configurable>();
+    List<Configurable> configurables = new ArrayList<Configurable>();
     Collections.sort(providers, new Comparator<DebuggerSettingsPanelProvider>() {
       public int compare(final DebuggerSettingsPanelProvider o1, final DebuggerSettingsPanelProvider o2) {
         return o2.getPriority() - o1.getPriority();
@@ -60,6 +60,11 @@ public class DebuggerConfigurableProvider extends ConfigurableProvider {
       return null;
     }
 
+    if (rootConfigurable == null && configurables.size() == 1) {
+      rootConfigurable = configurables.get(0);
+      configurables = Collections.emptyList();
+    }
+
     return new DebuggerConfigurable(rootConfigurable, configurables);
   }
 }