Also Fixed the "Close" menu behavior: it should close the menu popover instead of the entire Manager dialog