Fix issues with keyboard shortcuts