diff --git a/CHANGELOG.md b/CHANGELOG.md
index de7c559ea1dfe..899067adab03a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Fixes [#1449](https://github.com/eamodio/vscode-gitlens/issues/1449) - Configured remotes not showing up in quickpick menu when opening commit on remote
 - Fixes issues where auto-linking of GitHub 3rd party issue links didn't always work
+- Fixes issue with long commit messages on rebase editor
 
 ## [11.5.1] - 2021-06-14
 
diff --git a/src/webviews/apps/scss/rebase.scss b/src/webviews/apps/scss/rebase.scss
index 410282d2e4228..3a911c21df969 100644
--- a/src/webviews/apps/scss/rebase.scss
+++ b/src/webviews/apps/scss/rebase.scss
@@ -344,6 +344,7 @@ $entry-padding: 5px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+	width: 0;
 
 	.entry--fixup &,
 	.entry--drop & {