Fix keyboard shortcuts problem