diff --git a/packages/eui/src/components/code/code_block.styles.ts b/packages/eui/src/components/code/code_block.styles.ts
index b9eebda59d6..7ac806527c0 100644
--- a/packages/eui/src/components/code/code_block.styles.ts
+++ b/packages/eui/src/components/code/code_block.styles.ts
@@ -28,10 +28,6 @@ export const euiCodeBlockStyles = (euiThemeContext: UseEuiTheme) => {
       display: block;
       position: relative;
       background: ${codeSyntaxVariables.backgroundColor};
-      ${highContrastModeStyles(euiThemeContext, {
-        preferred: `border: ${euiTheme.border.thin};`,
-      })}
-
       ${codeSyntaxVariables.tokensCss}
     `,
     // Font size
@@ -84,6 +80,10 @@ export const euiCodeBlockPreStyles = (euiThemeContext: UseEuiTheme) => {
       overflow: auto;
       display: block;
       ${euiScrollBarStyles(euiThemeContext)}
+      ${highContrastModeStyles(euiThemeContext, {
+        // High contrast border must be on the <pre> element to play nicely with EuiText margins
+        preferred: `border: ${euiTheme.border.thin};`,
+      })}
     `,
     padding: {
       ...generatePaddingCss(euiThemeContext, (paddingSize: string) => {
diff --git a/packages/eui/src/components/markdown_editor/markdown_format.styles.ts b/packages/eui/src/components/markdown_editor/markdown_format.styles.ts
index 0d5fd44c914..c229068e075 100644
--- a/packages/eui/src/components/markdown_editor/markdown_format.styles.ts
+++ b/packages/eui/src/components/markdown_editor/markdown_format.styles.ts
@@ -32,10 +32,6 @@ const euiScaleMarkdownFormatText = (
   return `
     .euiMarkdownFormat__codeblockWrapper {
       ${logicalCSS('margin-bottom', fontSize)}
-
-      .euiCodeBlock__pre {
-        ${logicalCSS('margin-bottom', 0)}
-      }
     }
 
     .euiMarkdownFormat__table {