diff --git a/CHANGELOG b/CHANGELOG
index 92de32d3f71c7b8853fb109ae029bf6501755de5..8510f374c3af33bcfcd8177c67b904b6d13a4bc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.13.0 (unreleased)
   - Expose expires_at field when sharing project on API
   - Allow the Koding integration to be configured through the API
   - Added soft wrap button to repository file/blob editor
+  - Add word-wrap to issue title on issue and milestone boards (ClemMakesApps)
   - Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
   - Close open merge request without source project (Katarzyna Kobierska Ula Budziszewska)
   - Use a ConnectionPool for Rails.cache on Sidekiq servers
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 9c84dceed0574b8860cae5f11e0621df7ceaba1f..ecc5b24e3601d8f7e424d9884b336d2ffe6357fb 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -197,6 +197,7 @@ lex
 
   a {
     color: inherit;
+    word-wrap: break-word;
   }
 }
 
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 6b865730487c234058d4be2f437edce838fd2de8..8c2ba3ed58cbd9c4678dbef95f9bf819d8fc3443 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -33,6 +33,7 @@
     // Issue title
     span a {
       color: $gl-text-color;
+      word-wrap: break-word;
     }
   }
 }