Fix broken Event-chain causing the popup block