diff --git a/frontend/app/shared/components/comment.component.html b/frontend/app/shared/components/comment.component.html
index 8ffa2f502..937f5b5c3 100644
--- a/frontend/app/shared/components/comment.component.html
+++ b/frontend/app/shared/components/comment.component.html
@@ -2,7 +2,7 @@
     <div class="col-auto">
         <img class="user-picture" title="{{comment.user | sqxUserNameRef}}" [src]="comment.user | sqxUserPictureRef" />
     </div>
-    <div class="col pl-2">            
+    <div class="col pl-2 col-right">            
         <div class="comment-message">
             <div class="user-row">
                 <div class="user-ref">{{comment.user | sqxUserNameRef}}</div>
diff --git a/frontend/app/shared/components/comment.component.scss b/frontend/app/shared/components/comment.component.scss
index edd70a03b..5d96c7a97 100644
--- a/frontend/app/shared/components/comment.component.scss
+++ b/frontend/app/shared/components/comment.component.scss
@@ -20,6 +20,11 @@
     }
 }
 
+.col-right {
+    overflow-wrap: break-word;
+    overflow-x: hidden;
+}
+
 .comment {
     & {
         font-size: .9rem;