Really do not roll up if selection is being tracked by arrow keys in

controls/combo.c

@@ -1422,9 +1422,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
 
 		/* do not roll up if selection is being tracked 
 		 * by arrowkeys in the dropdown listbox */
-
-                if( (lphc->dwStyle & CBS_SIMPLE) ||
-                    ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) )
+                if( ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) )
                 {
                    CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE );
                 }

controls/listbox.c

@@ -2307,7 +2307,7 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM wParam )
         LISTBOX_SetSelection( wnd, descr, caret, TRUE, FALSE);
         if (descr->style & LBS_NOTIFY)
         {
-	    if( descr->lphc && CB_GETTYPE(descr->lphc) != CBS_SIMPLE )
+	    if( descr->lphc )
             {
 		/* make sure that combo parent doesn't hide us */
 		descr->lphc->wState |= CBF_NOROLLUP;