Fix keybindings broken by invalid scoping