diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index a4984a5f0..17ed8f814 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -168,6 +168,21 @@
             ShowSuccess = true;
         }
 
+        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
+        {
+            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
+            if (folder != null)
+            {
+                FolderId = folder.FolderId;
+            }
+            else
+            {
+                FolderId = -1;
+                _message = "Folder Path " + Folder + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
+        }
+
         if (ShowFolders)
         {
             _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
@@ -184,21 +199,6 @@
             }
         }
 
-        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
-        {
-            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
-            if (folder != null)
-            {
-                FolderId = folder.FolderId;
-            }
-            else
-            {
-                FolderId = -1;
-                _message = "Folder Path " + Folder + "Does Not Exist";
-                _messagetype = MessageType.Error;
-            }
-        }
-
         if (FileId != -1)
         {
             File file = await FileService.GetFileAsync(FileId);