Extending BugFix #4053

Signed-off-by: Umair Khan <omerjerk@gmail.com>

Changed the event from 'submit' to when the user presses enter button.