diff --git a/static/app/components/core/code/codeBlock.tsx b/static/app/components/core/code/codeBlock.tsx
index 9453cf08cf20..e22d7bd41c5a 100644
--- a/static/app/components/core/code/codeBlock.tsx
+++ b/static/app/components/core/code/codeBlock.tsx
@@ -191,20 +191,21 @@ export function CodeBlock({
           />
         )}
       </Header>
-
-      <pre
-        className={`language-${String(language)}`}
-        data-line={linesToHighlight?.join(',')}
-      >
-        <Code
-          ref={ref}
+      <ScrollWrapper>
+        <pre
           className={`language-${String(language)}`}
-          onCopy={onSelectAndCopy}
-          disableUserSelection={disableUserSelection}
+          data-line={linesToHighlight?.join(',')}
         >
-          {children}
-        </Code>
-      </pre>
+          <Code
+            ref={ref}
+            className={`language-${String(language)}`}
+            onCopy={onSelectAndCopy}
+            disableUserSelection={disableUserSelection}
+          >
+            {children}
+          </Code>
+        </pre>
+      </ScrollWrapper>
     </Wrapper>
   );
 
@@ -216,12 +217,15 @@ export function CodeBlock({
 const Wrapper = styled('div')<{isRounded: boolean}>`
   position: relative;
   height: 100%;
+  min-width: 0;
   background: var(--prism-block-background);
   border-radius: ${p => (p.isRounded ? p.theme.radius.md : '0px')};
 
   pre {
     margin: 0;
     height: 100%;
+    width: max-content;
+    min-width: 100%;
   }
 
   &[data-render-inline='true'] pre {
@@ -304,6 +308,11 @@ const CopyButton = styled(Button)<{isAlwaysVisible: boolean}>`
   ${p => (p.isAlwaysVisible ? 'opacity: 1;' : '')}
 `;
 
+const ScrollWrapper = styled('div')`
+  overflow-x: auto;
+  height: 100%;
+`;
+
 const Code = styled('code')<{disableUserSelection?: boolean}>`
   user-select: ${p => (p.disableUserSelection ? 'none' : 'auto')};
 `;
diff --git a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
index c3d85301d132..52ef14d2d2b1 100644
--- a/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
+++ b/static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx
@@ -509,7 +509,7 @@ function SlowDBQueryEvidence({
 
   const queryValue = (
     <QueryCard>
-      <Stack>
+      <Stack minWidth={0}>
         <NoPaddingClippedBox clipHeight={200}>
           <StyledCodeSnippet language="sql">
             {formatter.toString(span.description ?? '')}
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx
index b29badf2a1eb..9af29e0191b3 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/span/eapSections/description.tsx
@@ -171,7 +171,7 @@ export function SpanDescription({
 
   const value =
     resolvedModule === ModuleName.DB ? (
-      <Stack flex="1">
+      <Stack flex="1" minWidth={0}>
         <StyledCodeSnippet
           language={dbSystem === 'mongodb' ? 'json' : 'sql'}
           isRounded={false}