diff --git a/ui/scss/component/_comments.scss b/ui/scss/component/_comments.scss
index e1493dc8d..7332963b4 100644
--- a/ui/scss/component/_comments.scss
+++ b/ui/scss/component/_comments.scss
@@ -57,6 +57,8 @@
 
 .comment__message {
   white-space: pre-line;
+  word-wrap: break-word;
+  word-break: break-all;
   margin-top: var(--spacing-s);
 }