#271 - Fix keyboard shortcuts