diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 18ceebdf678..0e12648c6ac 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -869,6 +869,7 @@
 		"--vscode-textLink-activeForeground",
 		"--vscode-textLink-foreground",
 		"--vscode-textPreformat-background",
+		"--vscode-textPreformat-border",
 		"--vscode-textPreformat-foreground",
 		"--vscode-textSeparator-foreground",
 		"--vscode-titleBar-activeBackground",
diff --git a/src/vs/platform/theme/common/colors/baseColors.ts b/src/vs/platform/theme/common/colors/baseColors.ts
index 514fdc8a4e9..a3e85f9e88e 100644
--- a/src/vs/platform/theme/common/colors/baseColors.ts
+++ b/src/vs/platform/theme/common/colors/baseColors.ts
@@ -65,13 +65,15 @@ export const textSeparatorForeground = registerColor('textSeparator.foreground',
 // ------ text preformat
 
 export const textPreformatForeground = registerColor('textPreformat.foreground',
-	{ light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' },
+	{ light: '#A31515', dark: '#D7BA7D', hcDark: '#FFFFFF', hcLight: '#FFFFFF' },
 	nls.localize('textPreformatForeground', "Foreground color for preformatted text segments."));
 
 export const textPreformatBackground = registerColor('textPreformat.background',
-	{ light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' },
+	{ light: '#0000001A', dark: '#FFFFFF1A', hcDark: null, hcLight: '#09345f' },
 	nls.localize('textPreformatBackground', "Background color for preformatted text segments."));
-
+export const textPreformatBorder = registerColor('textPreformat.border',
+	{ light: null, dark: null, hcDark: contrastBorder, hcLight: null },
+	nls.localize('textPreformatBorder', "Border color for preformatted text segments."));
 
 // ------ text block quote
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatThinkingContent.css b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatThinkingContent.css
index 6b99f0bd934..85184d2a95a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatThinkingContent.css
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatThinkingContent.css
@@ -62,6 +62,7 @@
 				background-color: var(--vscode-textPreformat-background);
 				padding: 1px 3px;
 				border-radius: 4px;
+				border: 1px solid var(--vscode-textPreformat-border);
 				white-space: pre-wrap;
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index b145d368fb4..b948822a0f7 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -627,6 +627,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		background-color: var(--vscode-textPreformat-background);
 		padding: 1px 3px;
 		border-radius: 4px;
+		border: 1px solid var(--vscode-textPreformat-border);
 		white-space: pre-wrap;
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css b/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css
index 97830695b83..36fc8b4bee6 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css
@@ -173,6 +173,7 @@
 	background-color: var(--vscode-textPreformat-background);
 	padding: 1px 3px;
 	border-radius: 4px;
+	border: 1px solid var(--vscode-textPreformat-border);
 }
 
 .monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message .interactive-result-code-block {
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
index ed0beac4ec2..9bd44961577 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
@@ -609,6 +609,7 @@
 	background-color: var(--vscode-textPreformat-background);
 	padding: 1px 3px;
 	border-radius: 4px;
+	border: 1px solid var(--vscode-textPreformat-border);
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown .monaco-tokenized-source {
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 68738027aee..5b968eb5ed5 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -287,11 +287,7 @@ export class ReleaseNotesManager extends Disposable {
 					code:has(.codesetting) {
 						background-color: var(--vscode-textPreformat-background);
 						color: var(--vscode-textPreformat-foreground);
-						padding-left: 1px;
-						margin-right: 3px;
-						padding-right: 0px;
-					}
-
+					border: 1px solid var(--vscode-textPreformat-border);
 					code:has(.codesetting):focus {
 						border: 1px solid var(--vscode-button-border, transparent);
 					}
diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html
index 9bd67086fd0..6040b405ed8 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/index.html
+++ b/src/vs/workbench/contrib/webview/browser/pre/index.html
@@ -151,6 +151,7 @@
 				background-color: var(--vscode-textPreformat-background);
 				padding: 1px 3px;
 				border-radius: 4px;
+				border: 1px solid var(--vscode-textPreformat-border);
 			}
 
 			pre code {
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
index 7ab127eaab4..997ed6e2df2 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
@@ -155,6 +155,7 @@
 	color: var(--vscode-textPreformat-foreground);
 	background-color: var(--vscode-textPreformat-background);
 	border-radius: 3px;
+	border: 1px solid var(--vscode-textPreformat-border);
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor {