To support new ComboBox behavior