diff --git a/src/components/Folder/index.tsx b/src/components/Folder/index.tsx
index 754516f4f..bc426a48e 100644
--- a/src/components/Folder/index.tsx
+++ b/src/components/Folder/index.tsx
@@ -331,7 +331,7 @@ export default function Folder({ data }: { data?: Agent }) {
 						(item: any) => item.name === chatStoreSelectedFile.name
 					);
 					console.log("file", file);
-					if (file) {
+					if (file && selectedFile?.path !== chatStoreSelectedFile?.path) {
 						selectedFileChange(file as FileInfo, isShowSourceCode);
 					}
 				}
@@ -353,7 +353,7 @@ export default function Folder({ data }: { data?: Agent }) {
 			const file = fileGroups[0].files.find(
 				(item: any) => item.path === chatStoreSelectedFile.path
 			);
-			if (file) {
+			if (file && selectedFile?.path !== chatStoreSelectedFile?.path) {
 				selectedFileChange(file as FileInfo, isShowSourceCode);
 			}
 		}
@@ -361,7 +361,7 @@ export default function Folder({ data }: { data?: Agent }) {
 		chatStore.tasks[chatStore.activeTaskId as string]?.selectedFile?.path,
 		fileGroups,
 		isShowSourceCode,
-		chatStore.activeTaskId
+		chatStore.activeTaskId,
 	]);
 
 	const handleBack = () => {
@@ -456,7 +456,7 @@ export default function Folder({ data }: { data?: Agent }) {
 							{fileGroups.map((group) =>
 								group.files.map((file) => (
 									<button
-										key={file.name}
+										key={file.path}
 										onClick={() => selectedFileChange(file, isShowSourceCode)}
 										className={`w-full flex items-center justify-center p-2 rounded-md hover:bg-fill-fill-primary-hover transition-colors ${
 											selectedFile?.name === file.name
diff --git a/src/components/TaskState/index.tsx b/src/components/TaskState/index.tsx
index d2754c455..d0ec7feac 100644
--- a/src/components/TaskState/index.tsx
+++ b/src/components/TaskState/index.tsx
@@ -102,30 +102,32 @@ export const TaskState = ({
 				</div>
 
 				{/* Reassigned */}
-				{reAssignTo && <div
-					className={`group hover:bg-tag-surface flex gap-xs items-center px-0.5 py-0.5 transition-all duration-200 ${
-						isSelected("reassigned") && "bg-tag-surface"
-					} ${
-						clickable && "cursor-pointer hover:opacity-80 transition-opacity"
-					}`}
-					onClick={() => handleStateClick("reassigned")}
-				>
-					<CircleSlash2
-						className={`w-[10px] h-[10px] text-icon-secondary group-hover:text-icon-warning ${
-							isSelected("reassigned") && "text-icon-warning"
-						}`}
-					/>
-					<span
-						className={`transition-all duration-200 text-xs leading-tight font-normal text-text-label group-hover:text-text-warning ${
-							isSelected("reassigned") && "text-text-warning"
+				{reAssignTo ? (
+					<div
+						className={`group hover:bg-tag-surface flex gap-xs items-center px-0.5 py-0.5 transition-all duration-200 ${
+							isSelected("reassigned") && "bg-tag-surface"
+						} ${
+							clickable && "cursor-pointer hover:opacity-80 transition-opacity"
 						}`}
+						onClick={() => handleStateClick("reassigned")}
 					>
-						Reassigned{" "}
-						<span className={fadeWidthClass(isSelected("reassigned"))}>
-							{reAssignTo}
+						<CircleSlash2
+							className={`w-[10px] h-[10px] text-icon-secondary group-hover:text-icon-warning ${
+								isSelected("reassigned") && "text-icon-warning"
+							}`}
+						/>
+						<span
+							className={`transition-all duration-200 text-xs leading-tight font-normal text-text-label group-hover:text-text-warning ${
+								isSelected("reassigned") && "text-text-warning"
+							}`}
+						>
+							Reassigned{" "}
+							<span className={fadeWidthClass(isSelected("reassigned"))}>
+								{reAssignTo}
+							</span>
 						</span>
-					</span>
-				</div>}
+					</div>
+				) : null}
 
 				{/* Ongoing */}
 				<div