diff --git a/CHANGELOG b/CHANGELOG
index 11464db5980f5b3adae4fb2f512b1eef25bb6269..b70d81cdd552a3e11287e126f3d43d7d112be989 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.13.0 (unreleased)
   - Use a ConnectionPool for Rails.cache on Sidekiq servers
   - Only update issuable labels if they have been changed
   - Revoke button in Applications Settings underlines on hover.
+  - Fix Long commit messages overflow viewport in file tree
   - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
   - Add organization field to user profile
   - Fix resolved discussion display in side-by-side diff view !6575
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 7b6577c513edade8a899ecfcf173f7e5d76982b6..41ad10f07bd3a660de59cb4a53e85e823fc683a1 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -27,7 +27,12 @@
       }
 
       .last-commit {
-        @include str-truncated(60%);
+        @include str-truncated(506px);
+        
+        @media (min-width: $screen-sm-max) and (max-width: $screen-md-max) {
+          @include str-truncated(450px);
+        }
+        
       }
 
       .commit-history-link-spacer {