diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
index 815c3a125f78..65adef3eaa57 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
@@ -317,7 +317,7 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener
     boolean useSystem;
 
     if ("default".equalsIgnoreCase(myMode.asString())) {
-      useSystem = !SystemInfo.isMac;
+      useSystem = true;
     } else if ("system".equalsIgnoreCase(myMode.asString())) {
       useSystem = true;
     } else if ("graphite".equalsIgnoreCase(myMode.asString())) {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
index 9b5bf7e057a5..b769111ca8c0 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
@@ -125,6 +125,8 @@ public abstract class AbstractValueHint {
   }
 
   public boolean isKeepHint(Editor editor, Point point) {
+    if (myCurrentHint != null && myCurrentHint.canControlAutoHide()) return true;
+
     if(myType == ValueHintType.MOUSE_ALT_OVER_HINT) {
       return false;
     }