Updated popup check