Hello Dave,
I have cherry-picked a patch (of Ashesh's) from our repository and appliedit on pgAdmin master branch. This fixes the issue.
Please see attached patch.
-- Regards,Sachin SrivastavaEnterpriseDB, India