Actually fix #62 by making sure the popup parameter gets passed everywhere it needs to.