diff --git a/.changeset/fix-org-selector-overlap.md b/.changeset/fix-org-selector-overlap.md
new file mode 100644
index 00000000000..42c018f0363
--- /dev/null
+++ b/.changeset/fix-org-selector-overlap.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Fixed organization selector overlapping with "Recent" text in chat pane header
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index d6a99803782..ee52fb019e2 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -1692,23 +1692,21 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			) : (
 				<div className="flex-1 min-h-0 overflow-y-auto flex flex-col gap-4 relative">
 					{/* Moved Task Bar Header Here */}
-					{taskHistoryFullLength !== 0 && (
-						<div className="flex text-vscode-descriptionForeground w-full mx-auto px-5 pt-3">
-							<div className="flex items-center gap-1 cursor-pointer" onClick={toggleExpanded}>
-								{taskHistoryFullLength < 10 && (
-									<span className={`font-medium text-xs `}>{t("history:recentTasks")}</span>
-								)}
-								<span
-									className={`codicon  ${isExpanded ? "codicon-eye" : "codicon-eye-closed"} scale-90`}
-								/>
+					<div className="flex items-center justify-between w-full mx-auto px-5 pt-3">
+						{taskHistoryFullLength !== 0 && (
+							<div className="flex text-vscode-descriptionForeground">
+								<div className="flex items-center gap-1 cursor-pointer" onClick={toggleExpanded}>
+									{taskHistoryFullLength < 10 && (
+										<span className={`font-medium text-xs `}>{t("history:recentTasks")}</span>
+									)}
+									<span
+										className={`codicon  ${isExpanded ? "codicon-eye" : "codicon-eye-closed"} scale-90`}
+									/>
+								</div>
 							</div>
-						</div>
-					)}
-					{!showTelemetryBanner && (
-						<div>
-							<OrganizationSelector className="absolute top-2 right-3" />
-						</div>
-					)}
+						)}
+						{!showTelemetryBanner && <OrganizationSelector className="w-40 shrink-0 ml-auto" />}
+					</div>
 					{/* kilocode_change start: changed the classes to support notifications */}
 					<div className="w-full h-full flex flex-col gap-4 px-3.5 transition-all duration-300">
 						{/* kilocode_change end */}