diff --git a/src/lib/components/workspace/Knowledge/KnowledgeBase/DirectoryRow.svelte b/src/lib/components/workspace/Knowledge/KnowledgeBase/DirectoryRow.svelte
index 23d26df782..6b47dcf72b 100644
--- a/src/lib/components/workspace/Knowledge/KnowledgeBase/DirectoryRow.svelte
+++ b/src/lib/components/workspace/Knowledge/KnowledgeBase/DirectoryRow.svelte
@@ -116,7 +116,10 @@
 	<button
 		class="relative flex items-center gap-1 rounded-xl p-2 text-left flex-1 justify-between"
 		type="button"
-		on:click={() => onNavigate(directory.id)}
+		on:click={() => {
+			if (editing) return;
+			onNavigate(directory.id);
+		}}
 	>
 		<div>
 			<div class="flex gap-2 items-center line-clamp-1">
@@ -129,6 +132,10 @@
 						on:keydown={(e) => {
 							if (e.key === 'Enter') submitRename();
 							if (e.key === 'Escape') cancelRename();
+							if (e.key === ' ') e.stopPropagation();
+						}}
+						on:keyup={(e) => {
+							if (e.key === ' ') e.stopPropagation();
 						}}
 						on:blur={submitRename}
 						on:click={(e) => e.stopPropagation()}
diff --git a/src/lib/components/workspace/Knowledge/KnowledgeBase/Files.svelte b/src/lib/components/workspace/Knowledge/KnowledgeBase/Files.svelte
index f48cf78530..7a9e837d30 100644
--- a/src/lib/components/workspace/Knowledge/KnowledgeBase/Files.svelte
+++ b/src/lib/components/workspace/Knowledge/KnowledgeBase/Files.svelte
@@ -108,6 +108,7 @@
 				class="relative flex items-center gap-1 rounded-xl p-2 text-left flex-1 justify-between"
 				type="button"
 				on:click={() => {
+					if (editingFileId) return;
 					onClick(file?.id ?? file?.tempId);
 				}}
 				on:dblclick={() => {
@@ -125,6 +126,10 @@
 								on:keydown={(e) => {
 									if (e.key === 'Enter') submitRename();
 									if (e.key === 'Escape') cancelRename();
+									if (e.key === ' ') e.stopPropagation();
+								}}
+								on:keyup={(e) => {
+									if (e.key === ' ') e.stopPropagation();
 								}}
 								on:blur={submitRename}
 								on:click={(e) => e.stopPropagation()}