bug fix for keyboard shortcuts