diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp
index f61e1f6bb4b..1b05b501a70 100644
--- a/base/shell/explorer/trayntfy.cpp
+++ b/base/shell/explorer/trayntfy.cpp
@@ -853,14 +853,17 @@ public:
     }
 
 
-    VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip)
+    VOID GetTooltipText(LPARAM data, LPTSTR szTip, DWORD cchTip)
     {
-        InternalIconData * notifyItem = GetItemData(index);
-
+        InternalIconData * notifyItem = reinterpret_cast<InternalIconData *>(data);
         if (notifyItem)
         {
             StringCchCopy(szTip, cchTip, notifyItem->szTip);
         }
+        else
+        {
+            StringCchCopy(szTip, cchTip, L"");
+        }
     }
 
     VOID ResizeImagelist()
@@ -1240,7 +1243,7 @@ public:
     LRESULT OnGetInfoTip(INT uCode, LPNMHDR hdr, BOOL& bHandled)
     {
         NMTBGETINFOTIPW * nmtip = (NMTBGETINFOTIPW *) hdr;
-        Toolbar.GetTooltipText(nmtip->iItem, nmtip->pszText, nmtip->cchTextMax);
+        Toolbar.GetTooltipText(nmtip->lParam, nmtip->pszText, nmtip->cchTextMax);
         return TRUE;
     }