fix click propagating through popup regression, close #2500