fix for contextmenu shortcuts not working - close #822