diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index d34fe4454101b10aff4fe5f8281281b86eecc88d..d39bd8c6531361ce7cc86c79dc13e86e6e746424 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -4123,13 +4123,13 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
 	if (nHit >= 0)
 	{
 	    btnPtr = &infoPtr->buttons[nHit];
-	    btnPtr->bHot = TRUE;
 
 	    infoPtr->nHotItem = nHit;
 
             /* only enabled buttons show hot effect */            
             if(infoPtr->buttons[nHit].fsState & TBSTATE_ENABLED)
             {
+                btnPtr->bHot = TRUE;
                 InvalidateRect(hwnd, &btnPtr->rect,
                     TOOLBAR_HasText(infoPtr, btnPtr));
             }