diff --git a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
index 34a6a5a6a4ebbf3b9f5c129d871f661c302cc10a..117b3811052e5a74ecfc7ffadd8d11952f92da81 100644
--- a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
+++ b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
@@ -108,8 +108,6 @@ extension DocumentsTableViewController {
     
     private func setupUI() {
         
-        fetchFolders()
-        
         setupToolbar()
         
         setupTableView()
@@ -197,6 +195,8 @@ extension DocumentsTableViewController {
         
         self.tabBarController?.tabBar.isHidden = false
         
+        fetchFolders()
+        
         fetchScanSessions()
         
         handleBackIcon()
@@ -234,9 +234,12 @@ extension DocumentsTableViewController {
     
     private func fetchFolders() {
         
+        let index = folders.firstIndex { $0.id == selectedFolder?.id } ?? 0
+        
         var folders = getFoldersUseCase.execute()
         folders.insert(.allDocuments, at: 0)
-        folders[0].isSelected = true
+        
+        folders[index].isSelected = true
         
         self.folders = folders