diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index b2a2cb2406..5a65441f23 100644
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -380,13 +380,6 @@ int wxFileDialog::ShowModal()
     AEDesc               mDefaultLocation ;
     bool               mSelectDefault = false ;
         
-    // zero all data
-    
-    m_path = wxEmptyString ;
-    m_fileName = wxEmptyString ;
-    m_paths.Empty();
-    m_fileNames.Empty();
-
     // setup dialog
         
     ::NavGetDefaultDialogOptions(&mNavOptions);
@@ -438,6 +431,13 @@ int wxFileDialog::ShowModal()
     c2pstr((char *)mNavOptions.savedFileName ) ;
 #endif
 
+    // zero all data
+    
+    m_path = wxEmptyString ;
+    m_fileName = wxEmptyString ;
+    m_paths.Empty();
+    m_fileNames.Empty();
+
     OpenUserDataRec            myData;
     MakeUserDataRec( &myData , m_wildCard ) ;
     myData.currentfilter = m_filterIndex ;
diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index b2a2cb2406..5a65441f23 100644
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -380,13 +380,6 @@ int wxFileDialog::ShowModal()
     AEDesc               mDefaultLocation ;
     bool               mSelectDefault = false ;
         
-    // zero all data
-    
-    m_path = wxEmptyString ;
-    m_fileName = wxEmptyString ;
-    m_paths.Empty();
-    m_fileNames.Empty();
-
     // setup dialog
         
     ::NavGetDefaultDialogOptions(&mNavOptions);
@@ -438,6 +431,13 @@ int wxFileDialog::ShowModal()
     c2pstr((char *)mNavOptions.savedFileName ) ;
 #endif
 
+    // zero all data
+    
+    m_path = wxEmptyString ;
+    m_fileName = wxEmptyString ;
+    m_paths.Empty();
+    m_fileNames.Empty();
+
     OpenUserDataRec            myData;
     MakeUserDataRec( &myData , m_wildCard ) ;
     myData.currentfilter = m_filterIndex ;