reset focus and make enter key behavior more sane

pressing enter while focusing on skip or previous shouldn’t go to next
step
Merge pull request #340 from connyay/issue-337

reset focus and make enter key behavior more sane