Merge pull request #3316 from dolik-rce/fix-goto-popup-location