Fix bug with multiple popups
Fix after rebase