fix popup events