Fix for menu item click