diff --git a/controls/combo.c b/controls/combo.c
index b5d20b19071..902643f97bb 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1088,9 +1088,9 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index )
        }
    }
 
-   lphc->wState |= CBF_NOEDITNOTIFY;
+   lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT);
    SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)"" );
-   lphc->wState &= ~CBF_NOEDITNOTIFY;
+   lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT);
 
    if( lphc->wState & CBF_FOCUSED )
       SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );