diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index bd030d6781..7e6c73154d 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -1910,6 +1910,9 @@ static void test_delete_items(void)
     /* Regression test for a crash when deleting the first visible item while bRedraw == false. */
     hTree = create_treeview_control(0);
 
+    ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0);
+    ok(ret == 0, "got %d\n", ret);
+
     ins.hParent = TVI_ROOT;
     ins.hInsertAfter = TVI_ROOT;
     U(ins).item.mask = TVIF_TEXT;
@@ -1924,9 +1927,6 @@ static void test_delete_items(void)
     hItem2 = TreeView_InsertItemA(hTree, &ins);
     ok(hItem2 != NULL, "InsertItem failed\n");
 
-    ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0);
-    ok(ret == 0, "got %d\n", ret);
-
     ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1);
     ok(ret == TRUE, "got %d\n", ret);
 
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 5938b29ebc..ae174138a9 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -1545,6 +1545,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item)
 
 	if (infoPtr->firstVisible == item)
 	{
+	    visible = TRUE;
 	    if (item->nextSibling)
 	       newFirstVisible = item->nextSibling;
 	    else if (item->prevSibling)