diff --git a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
index 35216cf71f64..456e4ccb7c01 100644
--- a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
@@ -118,7 +118,7 @@ public abstract class AbstractExpandableItemsHandler<KeyType, ComponentType exte
       @Override
       public void mouseExited(MouseEvent event) {
         // don't hide the hint if mouse exited to it
-        if (myTipComponent.getMousePosition() == null) {
+        if (Registry.is("ide.hide.expandable.tooltip.owner.mouse.exit") || myTipComponent.getMousePosition() == null) {
           hideHint();
         }
       }
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index db3c47c18000..9b27442b28ad 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -263,6 +263,8 @@ ide.helptooltip.enabled.restartRequired=true
 ide.helptooltip.enabled.description=Enables new style help context tooltips
 ide.helptooltip.regular.dismissDelay=10000
 ide.helptooltip.full.dismissDelay=30000
+ide.hide.expandable.tooltip.owner.mouse.exit=true
+ide.hide.expandable.tooltip.owner.mouse.exit.description=Provides autohiding for expandable tooltip when mouse leaves visible area of 'owner' component
 
 ide.expansion.hints.enabled=true
 ide.expansion.hints.enabled.description=Enables expansion hints for lists, trees and tables to show invisible part of a cell renderer.