diff --git a/CHANGES.md b/CHANGES.md
index 041929689..dba080c2f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -58,6 +58,7 @@
 
 - To @andrewzhurov for many code contributions on this release.
 - UI improvements in Project section (by @Waishnav) [#2285](https://github.com/penpot/penpot/pull/2285)
+- Fix fronted comments (by @lol768) [#2368](https://github.com/penpot/penpot/pull/2368)
 
 ## 1.15.4-beta
 
diff --git a/frontend/resources/styles/main/partials/comments.scss b/frontend/resources/styles/main/partials/comments.scss
index e3bd0904e..fab594179 100644
--- a/frontend/resources/styles/main/partials/comments.scss
+++ b/frontend/resources/styles/main/partials/comments.scss
@@ -191,7 +191,7 @@
         margin: 0 $size-2 0 26px;
         white-space: pre-wrap;
         display: inline-block;
-        word-break: break-all;
+        word-break: break-word;
       }
     }
   }