diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index fe1ead84..c92a3612 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -20,13 +20,13 @@
             <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
               <Grid Margin="0,10,0,8" ColumnDefinitions="Auto,*" ClipToBounds="True">
-                <SelectableTextBlock Grid.Column="0" Text="{Binding Author.Name}" Margin="2,0,8,0"/>
-                <SelectableTextBlock Grid.Column="1" Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="0" Text="{Binding Author.Name}" Margin="2,0,8,0"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="1" Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
               </Grid>
-              <SelectableTextBlock Text="{Binding AuthorTimeStr}"
-                                   Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-                                   Foreground="{DynamicResource Brush.FG2}"/>
+              <v:EnhancedSelectableTextBlock Text="{Binding AuthorTimeStr}"
+                                             Margin="2,0,0,0"
+                                             FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                             Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
 
@@ -36,13 +36,13 @@
             <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
               <Grid Margin="0,10,0,8" ColumnDefinitions="Auto,*" ClipToBounds="True">
-                <SelectableTextBlock Grid.Column="0" Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
-                <SelectableTextBlock Grid.Column="1" Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="0" Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
+                <v:EnhancedSelectableTextBlock Grid.Column="1" Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
               </Grid>
-              <SelectableTextBlock Text="{Binding CommitterTimeStr}"
-                                   Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
-                                   Foreground="{DynamicResource Brush.FG2}"/>
+              <v:EnhancedSelectableTextBlock Text="{Binding CommitterTimeStr}"
+                                             Margin="2,0,0,0"
+                                             FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
+                                             Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
         </UniformGrid>
diff --git a/src/Views/EnhancedSelectableTextBlock.cs b/src/Views/EnhancedSelectableTextBlock.cs
new file mode 100644
index 00000000..183b7021
--- /dev/null
+++ b/src/Views/EnhancedSelectableTextBlock.cs
@@ -0,0 +1,20 @@
+using System;
+
+using Avalonia;
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public class EnhancedSelectableTextBlock : SelectableTextBlock
+    {
+        protected override Type StyleKeyOverride => typeof(SelectableTextBlock);
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == TextProperty)
+                UpdateLayout();
+        }
+    }
+}