[[ Bug 11363 ]] Ensure popup menu is closed on closure of button