fix Popup remove/add sequence