remove popup first, will add back