Fixing the keyboard shortcuts, fixes #125