diff --git a/src/vs/workbench/contrib/styleOverrides/browser/media/editorBorder.css b/src/vs/workbench/contrib/styleOverrides/browser/media/editorBorder.css
index a04b2a87ff1..3836e8843e8 100644
--- a/src/vs/workbench/contrib/styleOverrides/browser/media/editorBorder.css
+++ b/src/vs/workbench/contrib/styleOverrides/browser/media/editorBorder.css
@@ -38,3 +38,32 @@
 .style-override .part.editor:not(.modal-editor-part)::after {
 	box-shadow: none;
 }
+
+/*
+ * Unify the surrounding chrome with the editor card: the floating side bar,
+ * auxiliary bar and bottom panel cards (see `browser/media/floatingPanels.css`)
+ * default to the `agentsPanel` border token. Re-point them at the same
+ * `editorGroup-border` token the editor card uses above so every top-level card
+ * shares one border color. Only the color is overridden; the width and radius
+ * from floatingPanels.css are kept. The extra `.monaco-workbench` class (both
+ * `.style-override` and `.floating-panels` sit on the workbench element) raises
+ * specificity above the equally-`!important` rule in floatingPanels.css.
+ */
+.monaco-workbench.style-override.floating-panels .part.sidebar,
+.monaco-workbench.style-override.floating-panels .part.auxiliarybar,
+.monaco-workbench.style-override.floating-panels .part.panel,
+.monaco-workbench.style-override.floating-panels .part.editor {
+	border-color: var(--vscode-agentsPanel-border, color-mix(in srgb, var(--vscode-foreground) 12%, transparent)) !important;
+}
+
+.monaco-workbench.style-override .chat-view-position-left > .voice-agent-controls-wrapper {
+	.agent-sessions-container {
+		border-right-color: var(--vscode-agentsPanel-border, color-mix(in srgb, var(--vscode-foreground) 12%, transparent)) !important;
+	}
+}
+
+.monaco-workbench.style-override .chat-view-position-right > .voice-agent-controls-wrapper {
+	.agent-sessions-container {
+		border-left-color: var(--vscode-agentsPanel-border, color-mix(in srgb, var(--vscode-foreground) 12%, transparent)) !important;
+	}
+}