Better fix for the export dialog.

Replace: 04a67b3a and 2d1954c6.