diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
index fe4b82c4d7d4..e188c7df9d84 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
@@ -87,7 +87,7 @@ public abstract class XVariablesViewBase extends XDebugView {
       disposeTreeRestorer();
       myTreeRestorer = myTreeState.restoreState(tree);
     }
-    if (position != null) {
+    if (position != null && Registry.is("debugger.valueTooltipAutoShowOnSelection")) {
       registerInlineEvaluator(stackFrame, tree, position, project);
     }
   }