Added watcher to ensure only one popup is open at a time