popup: fix after review