Use a class instead of id when creating and dismissing popups.

Also reduce the popup wait time, added screenshot.