diff --git a/src/lib/components/workspace/Models/Knowledge/Selector.svelte b/src/lib/components/workspace/Models/Knowledge/Selector.svelte
index a17a2d3aa7..7c6cb74d81 100644
--- a/src/lib/components/workspace/Models/Knowledge/Selector.svelte
+++ b/src/lib/components/workspace/Models/Knowledge/Selector.svelte
@@ -7,6 +7,8 @@
 	import { knowledge } from '$lib/stores';
 	import Dropdown from '$lib/components/common/Dropdown.svelte';
 	import Search from '$lib/components/icons/Search.svelte';
+	import { getNoteList } from '$lib/apis/notes';
+	import dayjs from 'dayjs';
 
 	const i18n = getContext('i18n');
 	const dispatch = createEventDispatcher();
@@ -27,8 +29,35 @@
 			: items;
 	}
 
-	onMount(() => {
-		let legacy_documents = $knowledge.filter((item) => item?.meta?.document);
+	const decodeString = (str: string) => {
+		try {
+			return decodeURIComponent(str);
+		} catch (e) {
+			return str;
+		}
+	};
+
+	onMount(async () => {
+		let notes = await getNoteList(localStorage.token).catch(() => {
+			return [];
+		});
+
+		notes = notes.map((note) => {
+			return {
+				...note,
+				type: 'note',
+				name: note.title,
+				description: dayjs(note.updated_at / 1000000).fromNow()
+			};
+		});
+
+		let legacy_documents = $knowledge
+			.filter((item) => item?.meta?.document)
+			.map((item) => ({
+				...item,
+				type: 'file'
+			}));
+
 		let legacy_collections =
 			legacy_documents.length > 0
 				? [
@@ -37,7 +66,6 @@
 							legacy: true,
 							type: 'collection',
 							description: 'Deprecated (legacy collection), please create a new knowledge base.',
-
 							title: $i18n.t('All Documents'),
 							collection_names: legacy_documents.map((item) => item.id)
 						},
@@ -51,7 +79,6 @@
 								legacy: true,
 								type: 'collection',
 								description: 'Deprecated (legacy collection), please create a new knowledge base.',
-
 								collection_names: legacy_documents
 									.filter((item) => (item?.meta?.tags ?? []).map((tag) => tag.name).includes(tag))
 									.map((item) => item.id)
@@ -59,11 +86,46 @@
 					]
 				: [];
 
-		items = [...$knowledge, ...legacy_collections].map((item) => {
+		let collections = $knowledge
+			.filter((item) => !item?.meta?.document)
+			.map((item) => ({
+				...item,
+				type: 'collection'
+			}));
+		let collection_files =
+			$knowledge.length > 0
+				? [
+						...$knowledge
+							.reduce((a, item) => {
+								return [
+									...new Set([
+										...a,
+										...(item?.files ?? []).map((file) => ({
+											...file,
+											collection: { name: item.name, description: item.description } // DO NOT REMOVE, USED IN FILE DESCRIPTION/ATTACHMENT
+										}))
+									])
+								];
+							}, [])
+							.map((file) => ({
+								...file,
+								name: file?.meta?.name,
+								description: `${file?.collection?.name} - ${file?.collection?.description}`,
+								type: 'file'
+							}))
+					]
+				: [];
+
+		items = [
+			...notes,
+			...collections,
+			...collection_files,
+			...legacy_collections,
+			...legacy_documents
+		].map((item) => {
 			return {
 				...item,
-				...(item?.legacy || item?.meta?.legacy || item?.meta?.document ? { legacy: true } : {}),
-				type: item?.meta?.document ? 'document' : 'collection'
+				...(item?.legacy || item?.meta?.legacy || item?.meta?.document ? { legacy: true } : {})
 			};
 		});
 
@@ -85,7 +147,7 @@
 
 	<div slot="content">
 		<DropdownMenu.Content
-			class="w-full max-w-80 rounded-xl px-1 py-1.5 border border-gray-300/30 dark:border-gray-700/50 z-50 bg-white dark:bg-gray-850 dark:text-white shadow-lg"
+			class="w-full max-w-96 rounded-xl px-1 py-1.5 border border-gray-300/30 dark:border-gray-700/50 z-50 bg-white dark:bg-gray-850 dark:text-white shadow-lg"
 			sideOffset={8}
 			side="bottom"
 			align="start"
@@ -104,7 +166,7 @@
 				</div>
 			</div>
 
-			<div class="max-h-48 overflow-y-scroll">
+			<div class="max-h-56 overflow-y-scroll">
 				{#if filteredItems.length === 0}
 					<div class="text-center text-sm text-gray-500 dark:text-gray-400">
 						{$i18n.t('No knowledge found')}
@@ -117,34 +179,48 @@
 								dispatch('select', item);
 							}}
 						>
-							<div class="flex items-center">
-								<div class="flex flex-col">
-									<div class=" w-fit mb-0.5">
-										{#if item.legacy}
-											<div
-												class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded-sm uppercase text-xs font-bold px-1"
-											>
-												Legacy
-											</div>
-										{:else if item?.meta?.document}
-											<div
-												class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded-sm uppercase text-xs font-bold px-1"
-											>
-												Document
-											</div>
-										{:else}
-											<div
-												class="bg-green-500/20 text-green-700 dark:text-green-200 rounded-sm uppercase text-xs font-bold px-1"
-											>
-												Collection
-											</div>
-										{/if}
-									</div>
+							<div>
+								<div class=" font-medium text-black dark:text-gray-100 flex items-center gap-1">
+									{#if item.legacy}
+										<div
+											class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded-sm uppercase text-xs font-bold px-1 shrink-0"
+										>
+											Legacy
+										</div>
+									{:else if item?.meta?.document}
+										<div
+											class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded-sm uppercase text-xs font-bold px-1 shrink-0"
+										>
+											Document
+										</div>
+									{:else if item?.type === 'file'}
+										<div
+											class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded-sm uppercase text-xs font-bold px-1 shrink-0"
+										>
+											File
+										</div>
+									{:else if item?.type === 'note'}
+										<div
+											class="bg-blue-500/20 text-blue-700 dark:text-blue-200 rounded-sm uppercase text-xs font-bold px-1 shrink-0"
+										>
+											Note
+										</div>
+									{:else}
+										<div
+											class="bg-green-500/20 text-green-700 dark:text-green-200 rounded-sm uppercase text-xs font-bold px-1 shrink-0"
+										>
+											Collection
+										</div>
+									{/if}
 
-									<div class="line-clamp-1 font-medium pr-0.5">
-										{item.name}
+									<div class="line-clamp-1">
+										{decodeString(item?.name)}
 									</div>
 								</div>
+
+								<div class=" text-xs text-gray-600 dark:text-gray-100 line-clamp-1">
+									{item?.description}
+								</div>
 							</div>
 						</DropdownMenu.Item>
 					{/each}
diff --git a/src/lib/components/workspace/Models/ModelEditor.svelte b/src/lib/components/workspace/Models/ModelEditor.svelte
index 68b661c64f..170181db16 100644
--- a/src/lib/components/workspace/Models/ModelEditor.svelte
+++ b/src/lib/components/workspace/Models/ModelEditor.svelte
@@ -183,10 +183,7 @@
 	onMount(async () => {
 		await tools.set(await getTools(localStorage.token));
 		await functions.set(await getFunctions(localStorage.token));
-		await knowledgeCollections.set([
-			...(await getNoteList(localStorage.token)),
-			...(await getKnowledgeBases(localStorage.token))
-		]);
+		await knowledgeCollections.set([...(await getKnowledgeBases(localStorage.token))]);
 
 		// Scroll to top 'workspace-container' element
 		const workspaceContainer = document.getElementById('workspace-container');