Fix enter key selection not working
Merge branch 'enter-key-select-fix'