diff --git a/src/renderer/components/Experiment/Rag/Documents.tsx b/src/renderer/components/Experiment/Rag/Documents.tsx
index 28456ce686324597a68108737889ad0fd0389976..7bea979c67a93df32156ab2e19382336f2e81cf9 100644
--- a/src/renderer/components/Experiment/Rag/Documents.tsx
+++ b/src/renderer/components/Experiment/Rag/Documents.tsx
@@ -146,7 +146,7 @@ export default function Documents({ experimentInfo, fullPage = false }) {
   const [previewFile, setPreviewFile] = React.useState<string | null>(null);
 
   const [showFolderModal, setShowFolderModal] = React.useState(false);
-  const [folderName, setFolderName] = React.useState('');
+  const [newFolderName, setNewFolderName] = React.useState('');
 
   const [loading, setLoading] = React.useState(false);
 
@@ -156,7 +156,10 @@ export default function Documents({ experimentInfo, fullPage = false }) {
     data: rows,
     isLoading,
     mutate,
-  } = useSWR(chatAPI.Endpoints.Documents.List(experimentInfo?.id), fetcher);
+  } = useSWR(
+    chatAPI.Endpoints.Documents.List(experimentInfo?.id, currentFolder),
+    fetcher
+  );
 
   const uploadFiles = async (formData) => {
     fetch(chatAPI.Endpoints.Documents.Upload(experimentInfo?.id), {
@@ -418,15 +421,15 @@ export default function Documents({ experimentInfo, fullPage = false }) {
           <Input
             size="sm"
             placeholder="Folder name"
-            value={folderName}
-            onChange={(e) => setFolderName(e.target.value)}
+            value={newFolderName}
+            onChange={(e) => setNewFolderName(e.target.value)}
           />
           <Box sx={{ display: 'flex', justifyContent: 'flex-end' }}>
             <Button
               color="primary"
               onClick={() => {
                 setLoading(true);
-                createFolder(folderName);
+                createFolder(newFolderName);
                 setLoading(false);
                 setShowFolderModal(false);
               }}
@@ -458,7 +461,7 @@ export default function Documents({ experimentInfo, fullPage = false }) {
                   setCurrentFolder('');
                 }}
               >
-                ../
+                .. /
               </Link>{' '}
               {currentFolder} /
             </>
@@ -494,6 +497,7 @@ export default function Documents({ experimentInfo, fullPage = false }) {
             </MenuItem>
             <MenuItem
               onClick={() => {
+                setNewFolderName('');
                 setShowFolderModal(true);
               }}
             >
diff --git a/src/renderer/lib/transformerlab-api-sdk.ts b/src/renderer/lib/transformerlab-api-sdk.ts
index 3c5a41ee32ae3ff0513cf832485b74962c2b4cc5..66f5cfd85b70feb1786860f68f7bcc65270e695d 100644
--- a/src/renderer/lib/transformerlab-api-sdk.ts
+++ b/src/renderer/lib/transformerlab-api-sdk.ts
@@ -1084,8 +1084,8 @@ Endpoints.Config = {
 };
 
 Endpoints.Documents = {
-  List: (experimentId: string) =>
-    API_URL() + 'experiment/' + experimentId + '/documents/list',
+  List: (experimentId: string, currentFolder: string = '') =>
+    API_URL() + 'experiment/' + experimentId + '/documents/list?folder=' + currentFolder,
   Open: (experimentId: string, document_name: string) =>
     API_URL() +
     'experiment/' +