Update hotkeys behavior
Merge pull request #437 from diath/patch-hotkeys

Update hotkeys behavior