diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 97826ec41..c084da952 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -66,7 +66,13 @@ public List<Models.Commit> Commits
                 if (SetProperty(ref _commits, value))
                 {
                     if (value.Count > 0 && lastSelected != null)
-                        SelectedCommit = value.Find(x => x.SHA == lastSelected.SHA);
+                    {
+                        var selected = value.Find(x => x.SHA == lastSelected.SHA);
+                        if (selected == null && lastSelected.IsCurrentHead)
+                            selected = value.Find(x => x.IsCurrentHead);
+
+                        SelectedCommit = selected;
+                    }
                 }
             }
         }