Fix handling of custom keybinds. Closes #34