Fixes #633 - Return to previous keymap