diff --git a/.changeset/fix-agent-manager-double-scrollbar.md b/.changeset/fix-agent-manager-double-scrollbar.md
new file mode 100644
index 00000000000..3d8ef60b51e
--- /dev/null
+++ b/.changeset/fix-agent-manager-double-scrollbar.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+fix(agent-manager): Fix double scrollbar in mode selector dropdowns
diff --git a/webview-ui/src/kilocode/agent-manager/components/AgentManagerApp.css b/webview-ui/src/kilocode/agent-manager/components/AgentManagerApp.css
index a7157e64f5e..7af4df674ec 100644
--- a/webview-ui/src/kilocode/agent-manager/components/AgentManagerApp.css
+++ b/webview-ui/src/kilocode/agent-manager/components/AgentManagerApp.css
@@ -1139,8 +1139,13 @@
 }
 
 .am-model-selector-content {
-	max-height: 300px !important;
 	min-width: 200px !important;
+	overflow: hidden !important;
+}
+
+/* Override inner scroll container height for compact dropdown */
+.am-model-selector-content > div > div:last-child {
+	max-height: 250px !important;
 }
 
 /* Read-only model indicator in chat input */
@@ -1203,10 +1208,13 @@
 }
 
 .am-session-mode-content {
-	max-height: 300px !important;
 	min-width: 180px !important;
-	overflow-y: auto !important;
-	overscroll-behavior: contain !important;
+	overflow: hidden !important;
+}
+
+/* Override inner scroll container height for compact dropdown */
+.am-session-mode-content > div > div:last-child {
+	max-height: 250px !important;
 }
 
 /* Mode Selector for New Agent Form */
@@ -1242,8 +1250,11 @@
 }
 
 .am-mode-selector-content {
-	max-height: 300px !important;
 	min-width: 200px !important;
-	overflow-y: auto !important;
-	overscroll-behavior: contain !important;
+	overflow: hidden !important;
+}
+
+/* Override inner scroll container height for compact dropdown */
+.am-mode-selector-content > div > div:last-child {
+	max-height: 250px !important;
 }