Index: source/aqua/SalAquaPicker.cxx
===================================================================
--- source/aqua/SalAquaPicker.cxx	(Revision 274595)
+++ source/aqua/SalAquaPicker.cxx	(Arbeitskopie)
@@ -48,6 +48,10 @@
 #include "CFStringUtilities.hxx"
 #include "NSString_OOoAdditions.hxx"
 
+#ifndef _NSURL_OOOADDITIONS_HXX_
+#include "NSURL_OOoAdditions.hxx"
+#endif
+
 #include "SalAquaFilePicker.hxx"
 
 #include <stdio.h>
@@ -188,6 +192,9 @@
             break;
     }
     
+    if (retVal == NSFileHandlingPanelOKButton) {
+        implsetDisplayDirectory([[NSURL fileURLWithPath:[m_pDialog directory] isDirectory:true] OUStringForInfo:FULLPATH]);
+    }
     
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
@@ -217,11 +224,6 @@
 
     if (aDirectory != m_sDisplayDirectory) {
         m_sDisplayDirectory = aDirectory;
-
-        if (m_pDialog != nil) {
-            //NSLog(@"would change now to:%@", [NSString stringWithOUString:aDirectory]);
-            // [m_pDialog setDirectory:[NSString stringWithOUString:aDirectory]];
-        }
     }
 
     DBG_PRINT_EXIT(CLASS_NAME, __func__);
Index: source/aqua/SalAquaFilePicker.cxx
===================================================================
--- source/aqua/SalAquaFilePicker.cxx	(Revision 274595)
+++ source/aqua/SalAquaFilePicker.cxx	(Arbeitskopie)
@@ -357,10 +357,6 @@
             if (nFiles > 1) {
                 aSelectedFiles[0] = OUString(sDirectoryURL);
             }
-
-            implsetDisplayDirectory(sDirectoryURL);
-
-            OSL_TRACE("dir url: %s", OUStringToOString(sDirectoryURL, RTL_TEXTENCODING_UTF8).getStr());
         }
     
         short nSequenceIndex = nFiles > 1 ? nIndex + 1 : nIndex;