diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index 871e6e2bcd6..74a677289e2 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -567,10 +567,12 @@ export const ChatRowContent = ({
 								style={{
 									display: "flex",
 									justifyContent: "space-between",
-									alignItems: "center",
+									alignItems: "flex-start",
 									gap: "10px",
 								}}>
-								<span style={{ display: "block", flexGrow: 1 }}>{highlightMentions(message.text)}</span>
+								<span style={{ display: "block", flexGrow: 1, padding: "4px" }}>
+									{highlightMentions(message.text)}
+								</span>
 								<VSCodeButton
 									appearance="icon"
 									style={{
diff --git a/webview-ui/src/index.css b/webview-ui/src/index.css
index ad2d8b58a3f..7995b7d34e2 100644
--- a/webview-ui/src/index.css
+++ b/webview-ui/src/index.css
@@ -119,6 +119,11 @@ https://github.com/microsoft/vscode-webview-ui-toolkit/tree/main/src/dropdown#wi
 	margin-bottom: 2px;
 }
 
+/* Fix dropdown double scrollbar overflow */
+#api-provider > div > ul {
+	overflow: unset;
+}
+
 /* Fix scrollbar in dropdown */
 
 vscode-dropdown::part(listbox) {