Merge pull request #3044 from colemanw/popup