Correctly handle popups inside already removed menus