IDEUI-215: handle enter key pressed
Merge with master