diff --git a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
index 43585ec5c82c..b625e8b449fb 100644
--- a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
@@ -347,7 +347,7 @@ public abstract class AbstractExpandableItemsHandler<KeyType, ComponentType exte
     Point location = new Point(visMaxX, cellBounds.y);
     SwingUtilities.convertPointToScreen(location, myComponent);
 
-    Rectangle screen = getScreenRectangle(location);
+    Rectangle screen = ScreenUtil.getScreenRectangle(location);
 
     int borderWidth = isPaintBorder() ? 1 : 0;
     int width = Math.min(screen.width + screen.x - location.x - borderWidth, cellMaxX - visMaxX);
@@ -380,12 +380,6 @@ public abstract class AbstractExpandableItemsHandler<KeyType, ComponentType exte
     return location;
   }
 
-  public static Rectangle getScreenRectangle(Point location) {
-    return !Registry.is("ide.expansion.hints.on.all.screens")
-                         ? ScreenUtil.getScreenRectangle(location)
-                         : ScreenUtil.getAllScreensRectangle();
-  }
-
   protected boolean isPaintBorder() {
     return true;
   }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 192f3fa9d1fa..3bffeb3c4c06 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -133,8 +133,9 @@ ide.tooltip.initialReshowDelay=300
 ide.tooltip.autoDismissDeadZone=300
 ide.balloon.shadowEnabled=true
 ide.balloon.shadow.size=15
+
 ide.expansion.hints.enabled=true
-ide.expansion.hints.on.all.screens=false
+ide.expansion.hints.enabled.description=Enables expansion hints for lists, trees and tables to show invisible part of a cell renderer.
 
 editor.balloonHints=true
 editor.mouseSelectionStateResetTimeout=1000
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRenderer.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRenderer.java
index 027140a9d6d8..c9af144d3b5c 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRenderer.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTreeRenderer.java
@@ -18,9 +18,9 @@ package com.intellij.xdebugger.impl.ui.tree;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.ui.AbstractExpandableItemsHandler;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.ExpandableItemsHandler;
+import com.intellij.ui.ScreenUtil;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.xdebugger.XDebuggerBundle;
 import com.intellij.xdebugger.frame.ImmediateFullValueEvaluator;
@@ -85,7 +85,7 @@ class XDebuggerTreeRenderer extends ColoredTreeCellRenderer {
         if (!StringUtil.isEmpty(rawValue) && tree.isShowing()) {
           Point treeRightSideOnScreen = new Point(visibleRectRightX, 0);
           SwingUtilities.convertPointToScreen(treeRightSideOnScreen, tree);
-          Rectangle screen = AbstractExpandableItemsHandler.getScreenRectangle(treeRightSideOnScreen);
+          Rectangle screen = ScreenUtil.getScreenRectangle(treeRightSideOnScreen);
           // text may fit the screen in ExpandableItemsHandler
           if (screen.x + screen.width < treeRightSideOnScreen.x + notFittingWidth) {
             myLongTextLink.setupComponent(rawValue, ((XDebuggerTree)tree).getProject());