Ajay | #3690 | Bugfix - Handle enter key press