diff --git a/pkg/interface/src/apps/chat/components/lib/message.js b/pkg/interface/src/apps/chat/components/lib/message.js
index 3c71544f43..0a7bc45a92 100644
--- a/pkg/interface/src/apps/chat/components/lib/message.js
+++ b/pkg/interface/src/apps/chat/components/lib/message.js
@@ -154,7 +154,7 @@ export class Message extends Component {
       );
     } else {
         return (
-          <section>
+          <section className="chat-md-message">
             <MessageMarkdown
               source={letter.text}
             />
diff --git a/pkg/interface/src/apps/chat/css/custom.css b/pkg/interface/src/apps/chat/css/custom.css
index 352981d4f2..b2a73dbecd 100644
--- a/pkg/interface/src/apps/chat/css/custom.css
+++ b/pkg/interface/src/apps/chat/css/custom.css
@@ -60,6 +60,10 @@ h2 {
   line-height: 16px;
 }
 
+.chat-md-message > pre {
+  overflow-x: auto;
+}
+
 .mono {
   font-family: "Source Code Pro", monospace;
 }