diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index fc5e81b4..34a72033 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -230,6 +230,12 @@ namespace SourceGit.Models
             set;
         } = 0;
 
+        public string LastCommitMessage
+        {
+            get;
+            set;
+        } = string.Empty;
+
         public Dictionary<string, FilterMode> CollectHistoriesFilters()
         {
             var map = new Dictionary<string, FilterMode>();
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 97d47a77..700cbd0f 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -464,6 +464,7 @@ namespace SourceGit.ViewModels
             _selectedView = _histories;
             _selectedViewIndex = 0;
 
+            _workingCopy.CommitMessage = _settings.LastCommitMessage;
             _autoFetchTimer = new Timer(AutoFetchImpl, null, 5000, 5000);
             RefreshAll();
         }
@@ -471,6 +472,7 @@ namespace SourceGit.ViewModels
         public void Close()
         {
             SelectedView = null; // Do NOT modify. Used to remove exists widgets for GC.Collect
+            _settings.LastCommitMessage = _workingCopy.CommitMessage;
 
             var settingsSerialized = JsonSerializer.Serialize(_settings, JsonCodeGen.Default.RepositorySettings);
             try