From ea83462e88847878c5d73f071dc4727c953253ed Mon Sep 17 00:00:00 2001
From: Raju Kumar <workwithrajukumar@gmail.com>
Date: Wed, 14 Jan 2026 22:53:03 +0530
Subject: [PATCH 1/2] fix(webview): remove double scrollbar in model selector

- Removed overflow-hidden from PopoverContent className
- Removed nested max-h-82 overflow-y-auto div
- contentClassName prop now controls all scroll behavior

Fixes #5033
---
 webview-ui/src/components/ui/select-dropdown.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/webview-ui/src/components/ui/select-dropdown.tsx b/webview-ui/src/components/ui/select-dropdown.tsx
index 78372b55682..8e1560f5f57 100644
--- a/webview-ui/src/components/ui/select-dropdown.tsx
+++ b/webview-ui/src/components/ui/select-dropdown.tsx
@@ -272,7 +272,7 @@ export const SelectDropdown = React.memo(
 						align={align}
 						sideOffset={sideOffset}
 						container={portalContainer}
-						className={cn("p-0 overflow-hidden", contentClassName)}>
+						className={cn("p-0", contentClassName)}>
 						<div className="flex flex-col w-full">
 							{/* Search input */}
 							{!disableSearch && (
@@ -296,9 +296,8 @@ export const SelectDropdown = React.memo(
 								</div>
 							)}
 
-							{/* Dropdown items - Use windowing for large lists */}
-							{/* kilocode_change: different max height: max-h-82 */}
-							<div className="max-h-82 overflow-y-auto">
+							{/* Dropdown items */}
+							<div>
 								{groupedOptions.length === 0 && searchValue ? (
 									<div className="py-2 px-3 text-sm text-vscode-foreground/70">No results found</div>
 								) : (

From ca9bc04e750f12fd9fcb900379c300c5de611acb Mon Sep 17 00:00:00 2001
From: Raju Kumar <workwithrajukumar@gmail.com>
Date: Wed, 14 Jan 2026 23:16:46 +0530
Subject: [PATCH 2/2] chore: add changeset for scrollbar fix

---
 .changeset/fix-model-selector-scrollbar.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/fix-model-selector-scrollbar.md

diff --git a/.changeset/fix-model-selector-scrollbar.md b/.changeset/fix-model-selector-scrollbar.md
new file mode 100644
index 00000000000..7d4100bc0e8
--- /dev/null
+++ b/.changeset/fix-model-selector-scrollbar.md
@@ -0,0 +1,7 @@
+---
+"@roo-code/vscode-webview": patch
+---
+
+fix: remove double scrollbar in model selector
+
+Removed nested overflow-y-auto divs that were creating duplicate scrollable containers. The contentClassName prop now has complete control over scroll behavior.