@ntrel,
Sorry (after the fact) to hijack your PR :cry: feel free to copy the above post to a separate issue it you think its worth it.
This PR I would suggest has the ability to work around it, as you say there are cancel buttons on the remaining dialogs.
As for OSX testing, I only mentioned it because you mentioned you have been working near OSX specific code, so you might have accidentally changed some of its preconditions, even if you didn't actually touch the OSX stuff itself, and I havn't had the chance to check (and might not recognise it even if I did).