The UX change you propose would be quite an improvement and it is unfortunate that I haven't considered that myself. I'll implement that in the next few days.