improve keyboard submition (enter) management