I was going to ask what the reason was for having a separate dialog, but your next review explains it.

I have not had the time to try the patch out, but with a quick glance it looks good. Please commit. I trust you have tested that it works ;)