diff --git a/src/Views/CommitMessageTextBox.axaml.cs b/src/Views/CommitMessageTextBox.axaml.cs
index dc0ec58e..5ee219db 100644
--- a/src/Views/CommitMessageTextBox.axaml.cs
+++ b/src/Views/CommitMessageTextBox.axaml.cs
@@ -179,6 +179,7 @@ namespace SourceGit.Views
             {
                 var repo = vm.Repository;
                 var menu = new ContextMenu();
+                menu.MaxWidth = 480;
 
                 var gitTemplate = await new Commands.Config(repo.FullPath).GetAsync("commit.template");
                 var templateCount = repo.Settings.CommitTemplates.Count;