Undo fix for popup menus