diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
index d4b5881c6616..48ff6e958ea4 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
@@ -92,6 +92,8 @@ open class FolderPickerActivity : FileActivity(),
                         // Show the list of spaces
                         initAndShowListOfSpaces()
                     } else {
+                        val accountName = intent.getStringExtra(KEY_ACCOUNT_NAME)
+                        account = AccountUtils.getOwnCloudAccountByName(this, accountName)
                         // Show the personal space
                         initAndShowListOfFilesFragment(spaceId = null)
                     }