T821-0 Fix editable dropdown