fix popup navigation