diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index ddc9cb01fb3..aa68102385b 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -1210,7 +1210,7 @@ HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, const INT *order)
         lpItem = &infoPtr->items[*order++];
 	lpItem->iOrder=i;
       }
-    infoPtr->bRectsValid=0;
+    HEADER_SetItemBounds(infoPtr);
     InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);
     return TRUE;
 }
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index 3268ccca1a7..e357f9d1a72 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -1175,7 +1175,7 @@ static void test_hdm_index_messages(HWND hParent)
     rect.left = 0;
     retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect);
     expect(TRUE, retVal);
-    todo_wine ok(rect.left != 0, "Expected updated rectangle\n");
+    ok(rect.left != 0, "Expected updated rectangle\n");
 
     flush_sequences(sequences, NUM_MSG_SEQUENCES);