diff --git a/src/ViewModels/CherryPick.cs b/src/ViewModels/CherryPick.cs
index ea601d5a..19dac059 100644
--- a/src/ViewModels/CherryPick.cs
+++ b/src/ViewModels/CherryPick.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
index 7ca823dc..a767b395 100644
--- a/src/Views/CommitMessagePresenter.cs
+++ b/src/Views/CommitMessagePresenter.cs
@@ -296,7 +296,8 @@ namespace SourceGit.Views
                         if (currentParent is { DataContext: ViewModels.CommitDetail currentDetail } &&
                             currentDetail.Commit.SHA == lastDetailCommit)
                         {
-                            _inlineCommits.Add(sha, c);
+                            if (!_inlineCommits.ContainsKey(sha))
+                                _inlineCommits.Add(sha, c);
 
                             // Make sure user still hovers the target SHA.
                             if (_lastHover == link && c != null)