Fixing problems with keyboard shortcuts