diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index ec0f6bfecb84a33160cdbff9b252e647c3971ff8..be7786c1dd4a4c1a1679f90d40c4d3c734db52e8 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2950,7 +2950,7 @@ TOOLBAR_GetRect (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     if (infoPtr == NULL)
 	return FALSE;
-    nIndex = (INT)wParam;
+    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
 	return FALSE;