diff --git a/apps/shinkai-desktop/src/components/chat/conversation-header.tsx b/apps/shinkai-desktop/src/components/chat/conversation-header.tsx
index 5424b46d..e5983f32 100644
--- a/apps/shinkai-desktop/src/components/chat/conversation-header.tsx
+++ b/apps/shinkai-desktop/src/components/chat/conversation-header.tsx
@@ -164,7 +164,9 @@ const ConversationHeaderWithInboxId = () => {
   const hasFiles = isSuccess && jobScope.vector_fs_items.length > 0;
 
   const filesAndFoldersCount = isSuccess
-    ? jobScope.vector_fs_folders.length + jobScope.vector_fs_items.length
+    ? jobScope.vector_fs_folders.length +
+      jobScope.vector_fs_items.length +
+      (hasFilesJobFolder ? 1 : 0)
     : 0;
   const hasConversationContext = hasFolders || hasFiles;
 
diff --git a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
index e5a18546..c7633fd4 100644
--- a/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
+++ b/apps/shinkai-desktop/src/components/chat/set-conversation-context.tsx
@@ -106,6 +106,7 @@ export const SetJobScopeDrawer = () => {
     }
   }, [isSetJobScopeOpen]);
 
+  console.log(selectedKeys, 'selectedKeys');
   return (
     <Sheet onOpenChange={setSetJobScopeOpen} open={isSetJobScopeOpen}>
       <SheetContent>
@@ -186,7 +187,7 @@ export const SetJobScopeDrawer = () => {
             size="sm"
             type="button"
           >
-            {t('common.done')}
+            {inboxId ? t('common.saveChanges') : t('common.done')}
           </Button>
         </SheetFooter>
       </SheetContent>