Fix KeyListener order and toggling defaults