diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index db368d80..8f427b54 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -14,11 +14,6 @@ namespace SourceGit.ViewModels
 {
     public class Histories : ObservableObject, IDisposable
     {
-        public Repository Repo
-        {
-            get => _repo;
-        }
-
         public bool IsLoading
         {
             get => _isLoading;
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 7afe12fa..d19edd0e 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -34,7 +34,7 @@
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="*"/>
               <ColumnDefinition Width="3"/>
-              <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/>
+              <ColumnDefinition SharedSizeGroup="AuthorName" Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.HistoriesAuthorColumnWidth, Mode=TwoWay}" MinWidth="80"/>
               <ColumnDefinition SharedSizeGroup="SHA" MinWidth="100"/>
               <ColumnDefinition SharedSizeGroup="Time" MinWidth="160"/>
             </Grid.ColumnDefinitions>
@@ -120,7 +120,7 @@
                 <Grid Height="26">
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=OneWay}"/>
+                    <ColumnDefinition SharedSizeGroup="AuthorName" Width="Auto"/>
                     <ColumnDefinition SharedSizeGroup="SHA" Width="Auto"/>
                     <ColumnDefinition SharedSizeGroup="Time" Width="Auto"/>
                   </Grid.ColumnDefinitions>
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index 18630e4c..919f8fdb 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -73,15 +73,6 @@ namespace SourceGit.Views
 
     public partial class Histories : UserControl
     {
-        public static readonly StyledProperty<GridLength> AuthorNameColumnWidthProperty =
-            AvaloniaProperty.Register<Histories, GridLength>(nameof(AuthorNameColumnWidth), new GridLength(120));
-
-        public GridLength AuthorNameColumnWidth
-        {
-            get => GetValue(AuthorNameColumnWidthProperty);
-            set => SetValue(AuthorNameColumnWidthProperty, value);
-        }
-
         public static readonly StyledProperty<Models.Branch> CurrentBranchProperty =
             AvaloniaProperty.Register<Histories, Models.Branch>(nameof(CurrentBranch));
 
@@ -150,7 +141,7 @@ namespace SourceGit.Views
         private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
         {
             var y = CommitListContainer.Scroll?.Offset.Y ?? 0;
-            var authorNameColumnWidth = AuthorNameColumnWidth.Value;
+            var authorNameColumnWidth = ViewModels.Preferences.Instance.Layout.HistoriesAuthorColumnWidth.Value;
             if (y != _lastScrollY || authorNameColumnWidth != _lastAuthorNameColumnWidth)
             {
                 _lastScrollY = y;
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index f1f3fccc..6b26f476 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -829,11 +829,10 @@
       <ContentControl Grid.Row="3" Content="{Binding SelectedView}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:Histories">
-            <v:Histories CurrentBranch="{Binding Repo.CurrentBranch}"
+            <v:Histories CurrentBranch="{Binding $parent[v:Repository].((vm:Repository)DataContext).CurrentBranch}"
                          Bisect="{Binding Bisect}"
-                         AuthorNameColumnWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.HistoriesAuthorColumnWidth, Mode=TwoWay}"
-                         IssueTrackerRules="{Binding Repo.Settings.IssueTrackerRules}"
-                         OnlyHighlightCurrentBranch="{Binding Repo.OnlyHighlightCurrentBranchInHistories}"
+                         IssueTrackerRules="{Binding $parent[v:Repository].((vm:Repository)DataContext).Settings.IssueTrackerRules}"
+                         OnlyHighlightCurrentBranch="{Binding $parent[v:Repository].((vm:Repository)DataContext).OnlyHighlightCurrentBranchInHistories}"
                          NavigationId="{Binding NavigationId}"/>
           </DataTemplate>