Merged #2476, URI dialog fixes

2018-05-17, Edouard Tisserant