fixed the enter key problem #SOCR-17