diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 213b5697463..c620892aa1a 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -8588,10 +8588,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN
   if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0;
 
   if (!infoPtr->bFocus)
-  {
     bReceivedFocus = TRUE;
-    SetFocus(infoPtr->hwndSelf);
-  }
 
   /* set left button down flag and record the click position */
   infoPtr->bLButtonDown = TRUE;
@@ -8721,6 +8718,9 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT
             LISTVIEW_DelayedEditItem);
     }
 
+    if (!infoPtr->bFocus)
+        SetFocus(infoPtr->hwndSelf);
+
     return 0;
 }