2 files changed, 13 insertions, 3 deletions

diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
index 3a3f32b83..4c481d486 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
@@ -48,6 +48,11 @@
     .comment-html {
       word-break: normal;
       word-wrap: break-word;
+      overflow-wrap: break-word;
+      -webkit-hyphens: auto;
+      -ms-hyphens: auto;
+      -moz-hyphens: auto;
+      hyphens: auto;
       text-align: justify;
 
       /deep/ a {
@@ -100,4 +105,4 @@
   .root-comment {
     img { margin-right: 10px; }
   }
-}
\ No newline at end of file
+}
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index d78e5c6a1..b9596cbee 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -216,7 +216,12 @@
 
       .video-info-description-html {
         word-break: normal;
-        word-wrap: normal;
+        word-wrap: break-word;
+        overflow-wrap: break-word;
+        -webkit-hyphens: auto;
+        -ms-hyphens: auto;
+        -moz-hyphens: auto;
+        hyphens: auto;
         text-align: justify;
       }
 
@@ -253,7 +258,7 @@
 
   .other-videos {
     padding-left: 1em;
-        
+
     .title-page {
       margin-top: 0;
     }