diff --git a/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift b/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift
index e7e743b90..b11d36e35 100644
--- a/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift	
+++ b/kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift	
@@ -125,9 +125,7 @@ class SaveFileViewController: UIViewController {
             ) {
                 selectedDriveFileManager = driveFileManager
             }
-            selectedDirectory = lastSelectedDirectory?.driveId == selectedDriveFileManager?.drive.id
-                ? lastSelectedDirectory
-                : selectedDriveFileManager?.getCachedRootFile()
+            selectedDirectory = getBestDirectory()
         }
 
         closeBarButtonItem.accessibilityLabel = KDriveResourcesStrings.Localizable.buttonClose
@@ -161,6 +159,30 @@ class SaveFileViewController: UIViewController {
         )
     }
 
+    func getBestDirectory() -> File? {
+        if lastSelectedDirectory?.driveId == selectedDriveFileManager?.drive.id {
+            return lastSelectedDirectory
+        }
+
+        guard let selectedDriveFileManager else { return nil }
+
+        let myFilesDirectory = selectedDriveFileManager.database.fetchResults(ofType: File.self) { lazyFiles in
+            lazyFiles.filter("rawVisibility = %@", FileVisibility.isPrivateSpace.rawValue)
+        }.first
+
+        if let myFilesDirectory {
+            return myFilesDirectory.freezeIfNeeded()
+        }
+
+        // If we are in a shared with me, we only have access to some folders that are shared with the user
+        guard selectedDriveFileManager.drive.sharedWithMe else { return nil }
+
+        let firstAvailableSharedDriveDirectory = selectedDriveFileManager.database.fetchResults(ofType: File.self) { lazyFiles in
+            lazyFiles.filter("rawVisibility = %@ AND driveId == %d", FileVisibility.isInSharedSpace.rawValue, selectedDriveFileManager.drive.id)
+        }.first
+        return firstAvailableSharedDriveDirectory?.freezeIfNeeded()
+    }
+
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         MatomoUtils.track(view: [MatomoUtils.Views.save.displayName, "SaveFile"])
@@ -476,7 +498,7 @@ extension SaveFileViewController: SelectDriveDelegate {
     func didSelectDrive(_ drive: Drive) {
         if let selectedDriveFileManager = accountManager.getDriveFileManager(for: drive.id, userId: drive.userId) {
             self.selectedDriveFileManager = selectedDriveFileManager
-            selectedDirectory = selectedDriveFileManager.getCachedRootFile()
+            selectedDirectory = getBestDirectory()
             sections = [.fileName, .driveSelection, .directorySelection]
             if itemProvidersContainHeicPhotos {
                 sections.append(.photoFormatOption)