diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index f597fc04..e7a5c072 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -93,12 +93,9 @@
                   <TextBlock Grid.Column="3" Classes="primary" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
                 </Grid>
 
-                <TextBlock Grid.Row="1"
-                           Classes="primary"
-                           Text="{Binding Subject}"
-                           VerticalAlignment="Bottom"
-                           DataContextChanged="OnCommitSubjectDataContextChanged"
-                           PointerMoved="OnCommitSubjectPointerMoved"/>
+                <Border Grid.Row="1" Background="Transparent" DataContextChanged="OnCommitSubjectDataContextChanged" PointerMoved="OnCommitSubjectPointerMoved">
+                  <TextBlock Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
+                </Border>
               </Grid>
             </Border>
           </DataTemplate>
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index a183182e..3631eb71 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -62,18 +62,18 @@ namespace SourceGit.Views
 
         private void OnCommitSubjectDataContextChanged(object sender, EventArgs e)
         {
-            if (sender is TextBlock textBlock)
-                ToolTip.SetTip(textBlock, null);
+            if (sender is Border border)
+                ToolTip.SetTip(border, null);
         }
 
         private void OnCommitSubjectPointerMoved(object sender, PointerEventArgs e)
         {
-            if (sender is TextBlock { DataContext: Models.Commit commit } textBlock &&
+            if (sender is Border { DataContext: Models.Commit commit } border &&
                 DataContext is ViewModels.FileHistories vm)
             {
-                var tooltip = ToolTip.GetTip(textBlock);
+                var tooltip = ToolTip.GetTip(border);
                 if (tooltip == null)
-                    ToolTip.SetTip(textBlock, vm.GetCommitFullMessage(commit));
+                    ToolTip.SetTip(border, vm.GetCommitFullMessage(commit));
             }
         }
     }