Merge pull request #958 from techee/goto_popup