diff --git a/gradle/changelog/fix_markdown_scrolling.yaml b/gradle/changelog/fix_markdown_scrolling.yaml
new file mode 100644
index 0000000000..ffae8221f5
--- /dev/null
+++ b/gradle/changelog/fix_markdown_scrolling.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Unnecessary scrollbar showing up in markdown views with code tags for certain resolutions
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index c4f77ee208..c73715e8ee 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -4783,7 +4783,7 @@ exports[`Storyshots MarkdownView Code without Lang 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <p>
@@ -4851,7 +4851,7 @@ exports[`Storyshots MarkdownView Commit Links 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -4962,7 +4962,7 @@ exports[`Storyshots MarkdownView Custom code renderer 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -5008,7 +5008,7 @@ exports[`Storyshots MarkdownView Default 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -6415,7 +6415,7 @@ exports[`Storyshots MarkdownView Header Anchor Links 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <a
@@ -14274,7 +14274,7 @@ exports[`Storyshots MarkdownView Images 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -14365,7 +14365,7 @@ exports[`Storyshots MarkdownView Inline Xml 1`] = `
     Inline xml outside of a code block is not supported
   </h2>
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -14698,7 +14698,7 @@ exports[`Storyshots MarkdownView Links 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -14826,7 +14826,7 @@ exports[`Storyshots MarkdownView Links without Base Path 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -14953,7 +14953,7 @@ exports[`Storyshots MarkdownView Skip Html 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -16279,7 +16279,7 @@ exports[`Storyshots MarkdownView XSS Prevention 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
@@ -16331,7 +16331,7 @@ exports[`Storyshots MarkdownView Xml Code Block 1`] = `
   className="MarkdownViewstories__Spacing-sc-1lofakk-0 isVeYs"
 >
   <div
-    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 iAcXxX content"
+    className="LazyMarkdownView__HorizontalScrollDiv-sc-w02jj8-0 dIItUM content"
   >
     <div>
       <h1
diff --git a/scm-ui/ui-components/src/markdown/LazyMarkdownView.tsx b/scm-ui/ui-components/src/markdown/LazyMarkdownView.tsx
index 17bf4f54a6..be8936dd48 100644
--- a/scm-ui/ui-components/src/markdown/LazyMarkdownView.tsx
+++ b/scm-ui/ui-components/src/markdown/LazyMarkdownView.tsx
@@ -101,6 +101,7 @@ const MarkdownErrorNotification: FC = () => {
 
 const HorizontalScrollDiv = styled.div`
   overflow-x: auto;
+  overflow-y: hidden;
 `;
 
 class LazyMarkdownView extends React.Component<Props, State> {