Trying to make more fixes for keyboard shortcuts.