Fixed watch_popup not working.