Here is a second version of the patch that also fixes the problem with
not being able to open the file chooser dialog.