diff --git a/packages/client/src/pages/Home/Hooks/useFiles.js b/packages/client/src/pages/Home/Hooks/useFiles.js
index 5e72a8b51c..2f7ac09b6e 100644
--- a/packages/client/src/pages/Home/Hooks/useFiles.js
+++ b/packages/client/src/pages/Home/Hooks/useFiles.js
@@ -315,7 +315,7 @@ const useFiles = ({
 
           const isFormRoom =
             selectedFolderStore.roomType === RoomsType.FormRoom ||
-            selectedFolderStore.type === FolderType.FormRoom;
+            selectedFolderStore.parentRoomType === FolderType.FormRoom;
 
           const payload = {
             extension: "pdf",
diff --git a/packages/client/src/store/ContextOptionsStore.js b/packages/client/src/store/ContextOptionsStore.js
index c0be163395..a9b411b295 100644
--- a/packages/client/src/store/ContextOptionsStore.js
+++ b/packages/client/src/store/ContextOptionsStore.js
@@ -974,7 +974,7 @@ class ContextOptionsStore {
     const filterUrlParams = filesFilter.toUrlParams();
     const url = getCategoryUrl(
       this.filesStore.categoryType,
-      filterUrlParams.folder,
+      filesFilter.folder,
     );
 
     navigate(