Better behaviour of enter key in email modal