Small usability optimization