diff --git a/2.x/trunk/phlib/treenew.c b/2.x/trunk/phlib/treenew.c
index d6fe057b1..43fd0cf9a 100644
--- a/2.x/trunk/phlib/treenew.c
+++ b/2.x/trunk/phlib/treenew.c
@@ -5313,14 +5313,26 @@ BOOLEAN PhTnpPrepareTooltipShow(
     }
 
     if (!Context->TooltipUnfolding)
+    {
+        SetWindowPos(
+            Context->TooltipsHandle,
+            HWND_TOPMOST,
+            0,
+            0,
+            0,
+            0,
+            SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_HIDEWINDOW
+            );
+
         return FALSE;
+    }
 
     rect = Context->TooltipRect;
     SendMessage(Context->TooltipsHandle, TTM_ADJUSTRECT, TRUE, (LPARAM)&rect);
     MapWindowPoints(Context->Handle, NULL, (POINT *)&rect, 2);
     SetWindowPos(
         Context->TooltipsHandle,
-        HWND_TOP,
+        HWND_TOPMOST,
         rect.left,
         rect.top,
         0,