diff --git a/.changeset/fifty-baboons-shine.md b/.changeset/fifty-baboons-shine.md
new file mode 100644
index 00000000000..c5e2515d0b0
--- /dev/null
+++ b/.changeset/fifty-baboons-shine.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Updates some visual bugs in Agent Behaviour settings page
diff --git a/webview-ui/src/components/kilocode/rules/RuleRow.tsx b/webview-ui/src/components/kilocode/rules/RuleRow.tsx
index 115ff4c84a1..06437dd83ba 100644
--- a/webview-ui/src/components/kilocode/rules/RuleRow.tsx
+++ b/webview-ui/src/components/kilocode/rules/RuleRow.tsx
@@ -30,7 +30,7 @@ const RuleRow: React.FC<{
 				<span
 					className="flex-1 overflow-hidden break-all whitespace-normal flex items-center mr-1"
 					title={rulePath}>
-					<span className="ph-no-capture">{getBasename(rulePath)}</span>
+					<span className="ph-no-capture truncate">{getBasename(rulePath)}</span>
 				</span>
 				<div className="flex items-center ml-2 space-x-2">
 					<div
diff --git a/webview-ui/src/components/mcp/McpView.tsx b/webview-ui/src/components/mcp/McpView.tsx
index 8359232393c..402bf7f58f5 100644
--- a/webview-ui/src/components/mcp/McpView.tsx
+++ b/webview-ui/src/components/mcp/McpView.tsx
@@ -128,7 +128,7 @@ const McpView = ({ onDone, hideHeader = false }: McpViewProps) => {
 								marginTop: "10px",
 								width: "100%",
 								display: "grid",
-								gridTemplateColumns: "repeat(auto-fit, minmax(200px, 1fr))",
+								gridTemplateColumns: "repeat(auto-fit, minmax(260px, 1fr))",
 								gap: "10px",
 							}}>
 							<Button
@@ -299,8 +299,10 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
 					padding: "8px",
 					background: "var(--vscode-textCodeBlock-background)",
 					cursor: isExpandable ? "pointer" : "default",
-					borderRadius: isExpanded || isExpandable ? "4px" : "4px 4px 0 0",
+					borderRadius: isExpanded ? "4px 4px 0 0" : "4px",
 					opacity: server.disabled ? 0.6 : 1,
+					minWidth: "260px",
+					border: "none",
 				}}
 				onClick={handleRowClick}>
 				{isExpandable && (
@@ -309,7 +311,7 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
 						style={{ marginRight: "8px" }}
 					/>
 				)}
-				<span style={{ flex: 1 }}>
+				<span style={{ flex: 1, display: "flex", alignItems: "center" }}>
 					{server.name}
 					{server.source && (
 						<span
@@ -378,6 +380,8 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
 								padding: "0 10px 10px 10px",
 								fontSize: "13px",
 								borderRadius: "0 0 4px 4px",
+								border: "none",
+								minWidth: "260px",
 							}}>
 							{/* kilocode_change start: Replace VSCodePanels with Radix UI Tabs for independent tab overflow */}
 							<Tabs defaultValue="tools" style={{ marginBottom: "10px" }}>
@@ -476,6 +480,8 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
 												flexDirection: "column",
 												gap: "8px",
 												width: "100%",
+												overflowX: "auto",
+												scrollbarWidth: "thin",
 											}}>
 											{[...server.errorHistory]
 												.sort((a, b) => b.timestamp - a.timestamp)