diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm
index f250780fe..7b8ba8259 100644
--- a/lib-src/FileDialog/mac/FileDialogPrivate.mm
+++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm
@@ -661,6 +661,9 @@ int FileDialog::ShowModal()
 
 void FileDialog::ModalFinishedCallback(void* panel, int returnCode)
 {
+    m_paths.Clear();
+    m_fileNames.Clear();
+
     int result = wxID_CANCEL;
     if (HasFlag(wxFD_SAVE))
     {
diff --git a/src/Project.cpp b/src/Project.cpp
index 161b334bf..53beb8d41 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -2397,12 +2397,7 @@ wxArrayString AudacityProject::ShowOpenDialog(wxString extraformat, wxString ext
    // Construct and display the file dialog
    wxArrayString selected;
 
-#if defined(__WXMSW__reenable_if_new_filtering_does_not_work)
-   // Make sure you build wxWidgets with filedlgg.cpp enabled in core/generic
-   wxGenericFileDialog dlog(NULL,
-#else
    FileDialog dlog(NULL,
-#endif
                    _("Select one or more audio files..."),
                    path,
                    wxT(""),