diff --git a/console/client/src/components/CodeBlock.tsx b/console/client/src/components/CodeBlock.tsx
index 04b67ef82a..8483e47c8d 100644
--- a/console/client/src/components/CodeBlock.tsx
+++ b/console/client/src/components/CodeBlock.tsx
@@ -21,13 +21,20 @@ export const CodeBlock: React.FC<Props> = ({
 
   return (
     <SyntaxHighlighter
+      wrapLongLines={true}
+      lineProps={{style: {flexWrap: 'wrap'}}}
       language={language}
       style={
         isDarkMode
           ? (atomDark as React.CSSProperties)
           : (oneLight as React.CSSProperties)
       }
-      customStyle={{fontSize: '12px', maxHeight: `${maxHeight}px`}}
+      customStyle={{
+        fontSize: '12px',
+        maxHeight: `${maxHeight}px`,
+        overflow: 'auto',
+        maxWidth: `100%`,
+      }}
     >
       {code}
     </SyntaxHighlighter>