diff --git a/src/frontend/src/components/chatComponents/ContentDisplay.tsx b/src/frontend/src/components/chatComponents/ContentDisplay.tsx
index fbce64044c..0870ae453d 100644
--- a/src/frontend/src/components/chatComponents/ContentDisplay.tsx
+++ b/src/frontend/src/components/chatComponents/ContentDisplay.tsx
@@ -155,6 +155,12 @@ export default function ContentDisplay({
                 pre({ node, ...props }) {
                   return <>{props.children}</>;
                 },
+                ol({ node, ...props }) {
+                  return <ol className="max-w-full">{props.children}</ol>;
+                },
+                ul({ node, ...props }) {
+                  return <ul className="max-w-full">{props.children}</ul>;
+                },
                 code: ({ node, inline, className, children, ...props }) => {
                   const match = /language-(\w+)/.exec(className || "");
                   return !inline ? (
diff --git a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/newChatMessage.tsx b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/newChatMessage.tsx
index 5d7e4e2f17..07cd37f9a8 100644
--- a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/newChatMessage.tsx
+++ b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/newChatMessage.tsx
@@ -552,6 +552,20 @@ export default function ChatMessage({
                                           </span>
                                         );
                                       },
+                                      ol({ node, ...props }) {
+                                        return (
+                                          <ol className="max-w-full">
+                                            {props.children}
+                                          </ol>
+                                        );
+                                      },
+                                      ul({ node, ...props }) {
+                                        return (
+                                          <ul className="max-w-full">
+                                            {props.children}
+                                          </ul>
+                                        );
+                                      },
                                       pre({ node, ...props }) {
                                         return <>{props.children}</>;
                                       },