Next and last improvement to do

... and avoid to select the first item in an empty ComboBox.