#942 - Option labels don't revert from input mode