Fix menu item not highlighting bug