diff --git a/native/Avalonia.Native/src/OSX/StorageProvider.mm b/native/Avalonia.Native/src/OSX/StorageProvider.mm
index abf7f85c5f..92278a85e9 100644
--- a/native/Avalonia.Native/src/OSX/StorageProvider.mm
+++ b/native/Avalonia.Native/src/OSX/StorageProvider.mm
@@ -235,11 +235,6 @@ public:
                 panel.title = [NSString stringWithUTF8String:title];
             }
             
-            if(initialDirectory != nullptr)
-            {
-                auto directoryString = [NSString stringWithUTF8String:initialDirectory];
-                panel.directoryURL = [NSURL URLWithString:directoryString];
-            }
             
             if(initialFile != nullptr)
             {
@@ -248,6 +243,12 @@ public:
             
             SetAccessoryView(panel, filters, false);
             
+            if(initialDirectory != nullptr)
+            {
+                auto directoryString = [NSString stringWithUTF8String:initialDirectory];
+                panel.directoryURL = [NSURL URLWithString:directoryString];
+            }
+            
             auto handler = ^(NSModalResponse result) {
                 if(result == NSFileHandlingPanelOKButton)
                 {
@@ -304,11 +305,6 @@ public:
                 panel.title = [NSString stringWithUTF8String:title];
             }
             
-            if(initialDirectory != nullptr)
-            {
-                auto directoryString = [NSString stringWithUTF8String:initialDirectory];
-                panel.directoryURL = [NSURL URLWithString:directoryString];
-            }
             
             if(initialFile != nullptr)
             {
@@ -317,6 +313,12 @@ public:
             
             SetAccessoryView(panel, filters, true);
             
+            if(initialDirectory != nullptr)
+            {
+                auto directoryString = [NSString stringWithUTF8String:initialDirectory];
+                panel.directoryURL = [NSURL URLWithString:directoryString];
+            }
+            
             auto handler = ^(NSModalResponse result) {
                 if(result == NSFileHandlingPanelOKButton)
                 {