diff --git a/src/Models/TreeDataGridSelectionModel.cs b/src/Models/TreeDataGridSelectionModel.cs
index b016d739..e45393d0 100644
--- a/src/Models/TreeDataGridSelectionModel.cs
+++ b/src/Models/TreeDataGridSelectionModel.cs
@@ -42,23 +42,15 @@ namespace SourceGit.Models
 
         public void Select(IEnumerable<TModel> items)
         {
-            var sets = new HashSet<TModel>();
-            foreach (var item in items)
-                sets.Add(item);
-
             using (BatchUpdate())
             {
                 Clear();
 
-                int num = _source.Rows.Count;
-                for (int i = 0; i < num; ++i)
+                foreach (var selected in items)
                 {
-                    var m = _source.Rows[i].Model as TModel;
-                    if (m != null && sets.Contains(m))
-                    {
-                        var idx = _source.Rows.RowIndexToModelIndex(i);
+                    var idx = GetModelIndex(_source.Items, selected, IndexPath.Unselected);
+                    if (!idx.Equals(IndexPath.Unselected))
                         Select(idx);
-                    }
                 }
             }
         }
@@ -431,6 +423,30 @@ namespace SourceGit.Models
             return _childrenGetter?.Invoke(node);
         }
 
+        private IndexPath GetModelIndex(IEnumerable<TModel> collection, TModel model, IndexPath parent)
+        {
+            int i = 0;
+
+            foreach (var item in collection)
+            {
+                var index = parent.Append(i);
+                if (item != null && item == model)
+                    return index;
+
+                var children = GetChildren(item);
+                if (children != null)
+                {
+                    var findInChildren = GetModelIndex(children, model, index);
+                    if (!findInChildren.Equals(IndexPath.Unselected))
+                        return findInChildren;
+                }
+
+                i++;
+            }
+
+            return IndexPath.Unselected;
+        }
+
         private bool HasChildren(IRow row)
         {
             var children = GetChildren(row.Model as TModel);
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index f5aec074..8a10feab 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -131,12 +131,12 @@ namespace SourceGit.ViewModels
                             if (line.Type == Models.TextDiffLineType.Added)
                             {
                                 var sha = line.Content.Substring("Subproject commit ".Length);
-                                submoduleDiff.New = new Commands.QuerySingleCommit(submoduleRoot, sha).Result();
+                                submoduleDiff.New = new Commands.QuerySingleCommit(submoduleRoot, sha).Result() ?? new Models.Commit() { SHA = sha };
                             }
                             else if (line.Type == Models.TextDiffLineType.Deleted)
                             {
                                 var sha = line.Content.Substring("Subproject commit ".Length);
-                                submoduleDiff.Old = new Commands.QuerySingleCommit(submoduleRoot, sha).Result();
+                                submoduleDiff.Old = new Commands.QuerySingleCommit(submoduleRoot, sha).Result() ?? new Models.Commit() { SHA = sha };
                             }
                         }
                         rs = submoduleDiff;
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 82fd5265..27976d26 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -20,8 +20,8 @@
                       IsHitTestVisible="False"
                       User="{Binding StartPoint.Author}"/>
             <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding StartPoint.Author.Name}" Margin="8,0,0,0"/>
-            <Border Grid.Column="2" Background="DarkGreen" CornerRadius="4" IsVisible="{Binding StartPoint.IsCurrentHead}">
-              <TextBlock Text="HEAD" Classes="monospace" Margin="4,0"/>
+            <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding StartPoint.IsCurrentHead}">
+              <TextBlock Text="HEAD" Classes="monospace" Margin="4,0" Foreground="#FFDDDDDD"/>
             </Border> 
             <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding StartPoint.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
             <TextBlock Grid.Column="4" Classes="monospace" Text="{Binding StartPoint.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
@@ -44,8 +44,8 @@
                             IsHitTestVisible="False"
                             User="{Binding Author}"/>
                   <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                  <Border Grid.Column="2" Background="DarkGreen" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
-                    <TextBlock Text="HEAD" Classes="monospace" Margin="4,0"/>
+                  <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
+                    <TextBlock Text="HEAD" Classes="monospace" Margin="4,0" Foreground="#FFDDDDDD"/>
                   </Border>
                   <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA" />
                   <TextBlock Grid.Column="4" Classes="monospace" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
@@ -56,8 +56,8 @@
             </DataTemplate>
 
             <DataTemplate DataType="vm:CompareTargetWorktree">
-              <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="DarkGreen" CornerRadius="4">
-                <TextBlock Text="{DynamicResource Text.Worktree}" Classes="monospace" Margin="4,2"/>
+              <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
+                <TextBlock Text="{DynamicResource Text.Worktree}" Classes="monospace" Margin="4,2" Foreground="#FFDDDDDD"/>
               </Border>
             </DataTemplate>
           </ContentControl.DataTemplates>