diff --git a/webui/src/components/CommentInput/CommentInput.tsx b/webui/src/components/CommentInput/CommentInput.tsx
index f12ee8d8f1e35cd88a02c7d49891d1affa15dcd8..7bf0995dc784cc8499a34cb37c6ea60c7adec2eb 100644
--- a/webui/src/components/CommentInput/CommentInput.tsx
+++ b/webui/src/components/CommentInput/CommentInput.tsx
@@ -20,6 +20,7 @@ const useStyles = makeStyles((theme) => ({
     margin: theme.spacing(2, 0),
   },
   preview: {
+    overflow: 'auto',
     borderBottom: `solid 3px ${theme.palette.grey['200']}`,
     minHeight: '5rem',
   },
diff --git a/webui/src/pages/bug/Message.tsx b/webui/src/pages/bug/Message.tsx
index 808bb52529dcab99ae1ac1cf5218a2567f59b49e..bf7792084f39d56d493e74e7c8091dee58e1b472 100644
--- a/webui/src/pages/bug/Message.tsx
+++ b/webui/src/pages/bug/Message.tsx
@@ -57,6 +57,7 @@ const useStyles = makeStyles((theme) => ({
     marginLeft: '0.5rem',
   },
   body: {
+    overflow: 'auto',
     ...theme.typography.body2,
     paddingLeft: theme.spacing(1),
     paddingRight: theme.spacing(1),
diff --git a/webui/src/pages/bug/MessageHistoryDialog.tsx b/webui/src/pages/bug/MessageHistoryDialog.tsx
index 5879a373aa3e82a800580497b1d223819f001836..1571958025ee218ead343252f2c8cc9c0165fa40 100644
--- a/webui/src/pages/bug/MessageHistoryDialog.tsx
+++ b/webui/src/pages/bug/MessageHistoryDialog.tsx
@@ -111,6 +111,7 @@ const AccordionSummary = withStyles((theme) => ({
 const AccordionDetails = withStyles((theme) => ({
   root: {
     display: 'block',
+    overflow: 'auto',
     padding: theme.spacing(2),
   },
 }))(MuiAccordionDetails);