Fixed keyboard shortcut problems