diff --git a/src/Models/HistoryLayout.cs b/src/Models/HistoryLayout.cs
new file mode 100644
index 000000000..e2308c10f
--- /dev/null
+++ b/src/Models/HistoryLayout.cs
@@ -0,0 +1,9 @@
+namespace SourceGit.Models
+{
+    public enum HistoryLayout
+    {
+        Stacked,
+        SideBySide,
+        Focused,
+    }
+}
diff --git a/src/Models/RepositoryUIStates.cs b/src/Models/RepositoryUIStates.cs
index 8657b93b6..bb68010da 100644
--- a/src/Models/RepositoryUIStates.cs
+++ b/src/Models/RepositoryUIStates.cs
@@ -45,6 +45,12 @@ public double AuthorColumnWidth
             set;
         } = 120;
 
+        public double FocusedHistoryDetailsWidth
+        {
+            get;
+            set;
+        } = 340;
+
         public bool EnableTopoOrderInHistory
         {
             get;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index d3ffb203a..c90a11326 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -515,6 +515,8 @@
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Track all *{0} files</x:String>
   <x:String x:Key="Text.GotoRevisionSelector" xml:space="preserve">Select Commit</x:String>
   <x:String x:Key="Text.Histories.AdvancedOptions" xml:space="preserve">Advanced Options</x:String>
+  <x:String x:Key="Text.Histories.BackToGraph" xml:space="preserve">← Graph</x:String>
+  <x:String x:Key="Text.Histories.CopyCommitSHA" xml:space="preserve">Copy full commit SHA</x:String>
   <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTHOR</x:String>
   <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">AUTHOR TIME</x:String>
   <x:String x:Key="Text.Histories.Header.CommitTime" xml:space="preserve">COMMIT TIME</x:String>
@@ -527,6 +529,7 @@
   <x:String x:Key="Text.Histories.HighlightsInGraph.SelectedCommitsOnly" xml:space="preserve">Selected Commits Only</x:String>
   <x:String x:Key="Text.Histories.HighlightsInGraph.SelectedCommitsOnlyFirstParent" xml:space="preserve">Selected Commits (First-parent Only)</x:String>
   <x:String x:Key="Text.Histories.Selected" xml:space="preserve">SELECTED {0} COMMITS</x:String>
+  <x:String x:Key="Text.Histories.SelectionDetails" xml:space="preserve">DETAILS</x:String>
   <x:String x:Key="Text.Histories.ShowColumns" xml:space="preserve">SHOW COLUMNS</x:String>
   <x:String x:Key="Text.Histories.Tips" xml:space="preserve">Hold 'Ctrl' or 'Shift' to select multiple commits.</x:String>
   <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">Hold ⌘ or ⇧ to select multiple commits.</x:String>
@@ -822,6 +825,7 @@
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filter in commit graph</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Summary" xml:space="preserve">filter(s) enabled</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Focused" xml:space="preserve">Focused</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertical</x:String>
   <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">COMMITS ORDER</x:String>
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 636aad665..fb2c96a95 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -539,9 +539,9 @@ private void Refresh()
             }, token);
         }
 
-        private void UpdateDetails()
+        public void UpdateDetails()
         {
-            if (ActiveTabIndex == 1 && _changeSelection is { Count: 1, HasFolder: false })
+            if ((ActiveTabIndex == 1 || Preferences.Instance.IsFocusedHistoryLayout) && _changeSelection is { Count: 1, HasFolder: false })
                 DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_commit, _changeSelection.Changes[0]), _diffContext);
             else
                 DiffContext = null;
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 128b53ff9..18064b5dc 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -149,10 +150,92 @@ public object DetailContext
             set
             {
                 if (SetProperty(ref _detailContext, value))
+                {
+                    ShowGraph();
+                    ObserveDetailContext(value);
                     OnPropertyChanged(nameof(IsOpenAsStandaloneVisible));
+                }
+            }
+        }
+
+        public DiffContext FocusedDiff
+        {
+            get => _focusedDiff;
+            private set
+            {
+                if (SetProperty(ref _focusedDiff, value))
+                    OnPropertyChanged(nameof(IsFocusedDiffVisible));
             }
         }
 
+        public string FocusedDiffPath
+        {
+            get => _focusedDiffPath;
+            private set => SetProperty(ref _focusedDiffPath, value);
+        }
+
+        public bool IsFocusedDiffVisible => Preferences.Instance.IsFocusedHistoryLayout && FocusedDiff != null;
+
+        public void OpenFocusedDiff()
+        {
+            if (!Preferences.Instance.IsFocusedHistoryLayout)
+                return;
+
+            ChangeSelection selection;
+            DiffContext diff;
+            if (DetailContext is CommitDetail detail)
+            {
+                selection = detail.ChangeSelection;
+                if (detail.DiffContext == null)
+                    detail.UpdateDetails();
+                diff = detail.DiffContext;
+            }
+            else if (DetailContext is RevisionCompare compare)
+            {
+                selection = compare.ChangeSelection;
+                diff = compare.DiffContext;
+            }
+            else
+            {
+                return;
+            }
+
+            if (selection is { Count: 1, HasFolder: false } && diff != null)
+            {
+                FocusedDiffPath = selection.Changes[0].Path;
+                FocusedDiff = diff;
+            }
+        }
+
+        public void ShowGraph()
+        {
+            FocusedDiff = null;
+            FocusedDiffPath = string.Empty;
+        }
+
+        public void UpdateLayout()
+        {
+            ShowGraph();
+            OnPropertyChanged(nameof(RightArea));
+            OnPropertyChanged(nameof(BottomArea));
+        }
+
+        private void ObserveDetailContext(object context)
+        {
+            if (_observedDetailContext != null)
+                _observedDetailContext.PropertyChanged -= OnDetailContextPropertyChanged;
+            _observedDetailContext = context as INotifyPropertyChanged;
+            if (_observedDetailContext != null)
+                _observedDetailContext.PropertyChanged += OnDetailContextPropertyChanged;
+        }
+
+        private void OnDetailContextPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName is nameof(CommitDetail.Commit) or nameof(RevisionCompare.IsLoading) or
+                nameof(RevisionCompare.StartPoint) or nameof(RevisionCompare.EndPoint))
+                ShowGraph();
+        }
+
         public Models.Bisect Bisect
         {
             get => _bisect;
@@ -184,8 +267,20 @@ public GridLength LeftArea
 
         public GridLength RightArea
         {
-            get => _rightArea;
-            set => SetProperty(ref _rightArea, value);
+            get => Preferences.Instance.IsFocusedHistoryLayout ? new GridLength(_repo.UIStates.FocusedHistoryDetailsWidth) : _rightArea;
+            set
+            {
+                if (Preferences.Instance.IsFocusedHistoryLayout)
+                {
+                    if (value.IsAbsolute && value.Value >= 260)
+                    {
+                        _repo.UIStates.FocusedHistoryDetailsWidth = value.Value;
+                        OnPropertyChanged();
+                    }
+                }
+                else
+                    SetProperty(ref _rightArea, value);
+            }
         }
 
         public GridLength TopArea
@@ -199,7 +294,7 @@ public GridLength BottomArea
             get => _isCollapseDetails ? new GridLength(28, GridUnitType.Pixel) : _bottomArea;
             set
             {
-                if (!Preferences.Instance.UseTwoColumnsLayoutInHistories && !_isCollapseDetails)
+                if (!Preferences.Instance.IsHorizontalHistoryLayout && !_isCollapseDetails)
                     SetProperty(ref _bottomArea, value);
             }
         }
@@ -220,7 +315,7 @@ public bool IsCollapseDetails
             get => _isCollapseDetails;
             set
             {
-                if (!Preferences.Instance.UseTwoColumnsLayoutInHistories && SetProperty(ref _isCollapseDetails, value))
+                if (!Preferences.Instance.IsHorizontalHistoryLayout && SetProperty(ref _isCollapseDetails, value))
                 {
                     OnPropertyChanged(nameof(TopArea));
                     OnPropertyChanged(nameof(BottomArea));
@@ -588,6 +683,9 @@ private void GenerateGraph(List<Models.Commit> commits)
         private Models.Bisect _bisect = null;
         private object _detailContext = Models.Null.Instance;
         private bool _ignoreSelectionChange = false;
+        private INotifyPropertyChanged _observedDetailContext = null;
+        private DiffContext _focusedDiff = null;
+        private string _focusedDiffPath = string.Empty;
 
         private bool _isSearchingCommits = false;
         private SearchCommitContext _searchCommitContext = null;
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 4803ec429..c24d43bd9 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -213,8 +213,40 @@ public bool UseCompactBranchNamesInGraph
 
         public bool UseTwoColumnsLayoutInHistories
         {
-            get => _useTwoColumnsLayoutInHistories;
-            set => SetProperty(ref _useTwoColumnsLayoutInHistories, value);
+            get => IsHorizontalHistoryLayout;
+            set
+            {
+                // Keep reading older preference files. The explicit layout takes precedence,
+                // regardless of the order of properties in the JSON document.
+                if (SetProperty(ref _useTwoColumnsLayoutInHistories, value) && !_historyLayout.HasValue)
+                    NotifyHistoryLayoutChanged();
+            }
+        }
+
+        public Models.HistoryLayout HistoryLayout
+        {
+            get => _historyLayout ?? (_useTwoColumnsLayoutInHistories ? Models.HistoryLayout.SideBySide : Models.HistoryLayout.Stacked);
+            set
+            {
+                if (Enum.IsDefined(value) && _historyLayout != value)
+                {
+                    _historyLayout = value;
+                    NotifyHistoryLayoutChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
+        public bool IsHorizontalHistoryLayout => HistoryLayout != Models.HistoryLayout.Stacked;
+
+        [JsonIgnore]
+        public bool IsFocusedHistoryLayout => HistoryLayout == Models.HistoryLayout.Focused;
+
+        private void NotifyHistoryLayoutChanged()
+        {
+            OnPropertyChanged(nameof(HistoryLayout));
+            OnPropertyChanged(nameof(IsHorizontalHistoryLayout));
+            OnPropertyChanged(nameof(IsFocusedHistoryLayout));
         }
 
         public bool DisplayTimeAsPeriodInHistories
@@ -831,6 +863,7 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
 
         private bool _showTagsInGraph = true;
         private bool _useTwoColumnsLayoutInHistories = false;
+        private Models.HistoryLayout? _historyLayout = null;
         private bool _displayTimeAsPeriodInHistories = false;
         private bool _useSideBySideDiff = false;
         private bool _ignoreWhitespaceChangesInDiff = false;
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
index 5f0e2fc1f..14b7fbeb4 100644
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@@ -121,8 +121,8 @@ _endPoint is Models.Commit e &&
                 hashes.Contains(e.SHA))
                 return;
 
-            _startPoint = l;
-            _endPoint = r;
+            StartPoint = l;
+            EndPoint = r;
             Refresh();
         }
 
@@ -343,6 +343,9 @@ private void RefreshVisible()
 
         private void Refresh()
         {
+            OnPropertyChanged(nameof(LeftSideDesc));
+            OnPropertyChanged(nameof(RightSideDesc));
+
             Task.Run(async () =>
             {
                 _changes = await new Commands.CompareRevisions(_repo.FullPath, GetSHA(_startPoint), GetSHA(_endPoint))
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index 81b7030d6..8dc36d23e 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -166,6 +166,49 @@ public event EventHandler<RoutedEventArgs> ChangeDoubleTapped
         public ChangeCollectionView()
         {
             InitializeComponent();
+            AddHandler(PointerReleasedEvent, OnChangePointerReleased, RoutingStrategies.Bubble, true);
+            AddHandler(KeyDownEvent, OnChangeKeyDown, RoutingStrategies.Bubble, true);
+        }
+
+        public static readonly RoutedEvent<RoutedEventArgs> ChangeActivatedEvent =
+            RoutedEvent.Register<ChangeCollectionView, RoutedEventArgs>(nameof(ChangeActivated), RoutingStrategies.Bubble);
+
+        public event EventHandler<RoutedEventArgs> ChangeActivated
+        {
+            add { AddHandler(ChangeActivatedEvent, value); }
+            remove { RemoveHandler(ChangeActivatedEvent, value); }
+        }
+
+        private void OnChangePointerReleased(object sender, PointerReleasedEventArgs e)
+        {
+            if (e.InitialPressMouseButton != MouseButton.Left || e.KeyModifiers != KeyModifiers.None ||
+                Selection is not { Count: 1, HasFolder: false })
+                return;
+
+            for (var source = e.Source as Control; source != null && source != this; source = source.GetVisualParent() as Control)
+            {
+                if (source is not ListBoxItem item)
+                    continue;
+
+                var change = item.DataContext switch
+                {
+                    Models.Change c => c,
+                    ViewModels.ChangeTreeNode { IsFolder: false } node => node.Change,
+                    _ => null,
+                };
+                if (change == Selection.Changes[0])
+                    RaiseEvent(new RoutedEventArgs(ChangeActivatedEvent));
+                return;
+            }
+        }
+
+        private void OnChangeKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyModifiers != KeyModifiers.None || Selection is not { Count: 1, HasFolder: false })
+                return;
+
+            if (e.Key is Key.Enter or Key.Space or Key.Up or Key.Down or Key.Home or Key.End or Key.PageUp or Key.PageDown)
+                RaiseEvent(new RoutedEventArgs(ChangeActivatedEvent));
         }
 
         public void ToggleNodeIsExpanded(ViewModels.ChangeTreeNode node)
diff --git a/src/Views/ChangeListLayout.cs b/src/Views/ChangeListLayout.cs
new file mode 100644
index 000000000..813f84bff
--- /dev/null
+++ b/src/Views/ChangeListLayout.cs
@@ -0,0 +1,59 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public class ChangeListLayout : Grid
+    {
+        public static readonly StyledProperty<bool> IsFileListOnlyProperty =
+            AvaloniaProperty.Register<ChangeListLayout, bool>(nameof(IsFileListOnly));
+
+        public static readonly StyledProperty<GridLength> ListWidthProperty =
+            AvaloniaProperty.Register<ChangeListLayout, GridLength>(nameof(ListWidth), new GridLength(256));
+
+        public bool IsFileListOnly
+        {
+            get => GetValue(IsFileListOnlyProperty);
+            set => SetValue(IsFileListOnlyProperty, value);
+        }
+
+        public GridLength ListWidth
+        {
+            get => GetValue(ListWidthProperty);
+            set => SetValue(ListWidthProperty, value);
+        }
+
+        protected override System.Type StyleKeyOverride => typeof(Grid);
+
+        public ChangeListLayout()
+        {
+            ColumnDefinitions = new ColumnDefinitions("256,4,*");
+            ColumnDefinitions[0].PropertyChanged += (_, e) =>
+            {
+                if (!_updating && !IsFileListOnly && e.Property == ColumnDefinition.WidthProperty)
+                    SetCurrentValue(ListWidthProperty, ColumnDefinitions[0].Width);
+            };
+            RefreshLayout();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == IsFileListOnlyProperty || change.Property == ListWidthProperty)
+                RefreshLayout();
+        }
+
+        private void RefreshLayout()
+        {
+            _updating = true;
+            ColumnDefinitions[0].MinWidth = IsFileListOnly ? 0 : 200;
+            ColumnDefinitions[0].Width = IsFileListOnly ? GridLength.Star : ListWidth;
+            ColumnDefinitions[1].Width = new GridLength(IsFileListOnly ? 0 : 4);
+            ColumnDefinitions[2].MinWidth = IsFileListOnly ? 0 : 100;
+            ColumnDefinitions[2].Width = IsFileListOnly ? new GridLength(0) : GridLength.Star;
+            _updating = false;
+        }
+
+        private bool _updating = false;
+    }
+}
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index d6c0dba6b..8a5a92f4b 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -8,7 +8,115 @@
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.CommitBaseInfo"
-             x:Name="ThisControl">
+             x:Name="ThisControl"
+             Classes.compact="{Binding #ThisControl.IsCompact}">
+  <UserControl.Resources>
+    <DataTemplate x:Key="CompactCommitInfo" DataType="m:Commit">
+      <StackPanel Spacing="12" Margin="0,4,12,8">
+        <StackPanel Spacing="4">
+          <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
+          <Grid ColumnDefinitions="32,*">
+            <v:Avatar Width="28" Height="28" User="{Binding Author}" VerticalAlignment="Top"/>
+            <StackPanel Grid.Column="1" Margin="6,0,0,0" Spacing="2">
+              <Border Background="Transparent" Tag="{Binding Author}" ContextRequested="OnUserContextRequested">
+                <StackPanel>
+                  <SelectableTextBlock Text="{Binding Author.Name}" TextWrapping="Wrap"/>
+                  <SelectableTextBlock Text="{Binding Author.Email}" TextWrapping="Wrap" Foreground="{DynamicResource Brush.FG2}"/>
+                </StackPanel>
+              </Border>
+              <v:DateTimePresenter Timestamp="{Binding AuthorTime}" Foreground="{DynamicResource Brush.FG2}" ContextRequested="OnDateTimeContextMenuRequested"/>
+            </StackPanel>
+          </Grid>
+        </StackPanel>
+
+        <StackPanel Spacing="4" IsVisible="{Binding IsCommitterVisible}">
+          <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
+          <Grid ColumnDefinitions="32,*">
+            <v:Avatar Width="28" Height="28" User="{Binding Committer}" VerticalAlignment="Top"/>
+            <StackPanel Grid.Column="1" Margin="6,0,0,0" Spacing="2">
+              <Border Background="Transparent" Tag="{Binding Committer}" ContextRequested="OnUserContextRequested">
+                <StackPanel>
+                  <SelectableTextBlock Text="{Binding Committer.Name}" TextWrapping="Wrap"/>
+                  <SelectableTextBlock Text="{Binding Committer.Email}" TextWrapping="Wrap" Foreground="{DynamicResource Brush.FG2}"/>
+                </StackPanel>
+              </Border>
+              <v:DateTimePresenter Timestamp="{Binding CommitterTime}" Foreground="{DynamicResource Brush.FG2}" ContextRequested="OnDateTimeContextMenuRequested"/>
+            </StackPanel>
+          </Grid>
+        </StackPanel>
+
+        <StackPanel Spacing="4">
+          <Grid ColumnDefinitions="*,Auto,Auto">
+            <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.SHA}"/>
+            <Button Grid.Column="1" Classes="icon_button" Width="24" Height="24" Click="OnOpenContainsIn"
+                    IsVisible="{Binding #ThisControl.SupportsContainsIn}" ToolTip.Tip="{DynamicResource Text.CommitDetail.Info.ContainsIn}">
+              <Path Width="14" Height="14" Data="{StaticResource Icons.Milestone}"/>
+            </Button>
+            <Button Grid.Column="2" Classes="icon_button" Width="24" Height="24" Click="OnOpenWebLink"
+                    IsVisible="{Binding #ThisControl.WebLinks, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"
+                    ToolTip.Tip="{DynamicResource Text.CommitDetail.Info.WebLinks}">
+              <Path Width="12" Height="12" Data="{StaticResource Icons.Link}"/>
+            </Button>
+          </Grid>
+          <SelectableTextBlock Text="{Binding SHA}" FontFamily="{DynamicResource Fonts.Monospace}" TextWrapping="Wrap"/>
+        </StackPanel>
+
+        <StackPanel Spacing="4" IsVisible="{Binding Parents, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}">
+          <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Parents}"/>
+          <ItemsControl ItemsSource="{Binding Parents}">
+            <ItemsControl.ItemsPanel>
+              <ItemsPanelTemplate><WrapPanel/></ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+              <DataTemplate x:DataType="x:String">
+                <TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}" FontFamily="{DynamicResource Fonts.Monospace}"
+                           Foreground="{DynamicResource Brush.Link}" TextDecorations="Underline" Cursor="Hand" Margin="0,0,12,4"
+                           PointerPressed="OnSHAPressed" ContextRequested="OnSHAContextRequested" ToolTip.Tip="{Binding}"/>
+              </DataTemplate>
+            </ItemsControl.ItemTemplate>
+          </ItemsControl>
+        </StackPanel>
+
+        <StackPanel Spacing="4" IsVisible="{Binding HasDecorators}">
+          <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Refs}"/>
+          <v:CommitRefsPresenter AllowWrap="True" UseGraphColor="False" Foreground="{DynamicResource Brush.FG1}"
+                                 FontSize="12" PointerReleased="OnCommitRefsPresenterPointerReleased"/>
+        </StackPanel>
+
+        <ContentControl Content="{Binding #ThisControl.SignInfo}">
+          <ContentControl.DataTemplates>
+            <DataTemplate DataType="m:CommitSignInfo">
+              <StackPanel Spacing="4">
+                <TextBlock Text="{Binding ToolTip}" Foreground="{Binding Brush}" TextWrapping="Wrap"/>
+                <SelectableTextBlock Text="{Binding Signer}" TextWrapping="Wrap" IsVisible="{Binding HasSigner}"/>
+                <SelectableTextBlock Text="{Binding Key}" TextWrapping="Wrap" FontFamily="{DynamicResource Fonts.Monospace}"/>
+              </StackPanel>
+            </DataTemplate>
+          </ContentControl.DataTemplates>
+        </ContentControl>
+
+        <StackPanel Spacing="4">
+          <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Message}"/>
+          <v:CommitMessagePresenter FullMessage="{Binding #ThisControl.FullMessage}"
+                                    TextWrapping="Wrap" Foreground="{DynamicResource Brush.FG1}"
+                                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}">
+            <v:CommitMessagePresenter.ContextFlyout>
+              <MenuFlyout>
+                <MenuItem Header="{DynamicResource Text.Copy}" Command="{Binding $parent[SelectableTextBlock].Copy}"
+                          IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>
+                <MenuItem Header="{DynamicResource Text.CopyAllText}" Click="OnCopyAllCommitMessage"/>
+              </MenuFlyout>
+            </v:CommitMessagePresenter.ContextFlyout>
+          </v:CommitMessagePresenter>
+        </StackPanel>
+      </StackPanel>
+    </DataTemplate>
+  </UserControl.Resources>
+  <UserControl.Styles>
+    <Style Selector="v|CommitBaseInfo.compact">
+      <Setter Property="ContentTemplate" Value="{StaticResource CompactCommitInfo}"/>
+    </Style>
+  </UserControl.Styles>
   <UserControl.DataTemplates>
     <DataTemplate DataType="m:Commit">
       <StackPanel Orientation="Vertical">
diff --git a/src/Views/CommitBaseInfo.axaml.cs b/src/Views/CommitBaseInfo.axaml.cs
index 50809468d..ce8c67b5b 100644
--- a/src/Views/CommitBaseInfo.axaml.cs
+++ b/src/Views/CommitBaseInfo.axaml.cs
@@ -10,6 +10,15 @@ namespace SourceGit.Views
 {
     public partial class CommitBaseInfo : UserControl
     {
+        public static readonly StyledProperty<bool> IsCompactProperty =
+            AvaloniaProperty.Register<CommitBaseInfo, bool>(nameof(IsCompact));
+
+        public bool IsCompact
+        {
+            get => GetValue(IsCompactProperty);
+            set => SetValue(IsCompactProperty, value);
+        }
+
         public static readonly DirectProperty<CommitBaseInfo, Models.CommitFullMessage> FullMessageProperty =
             AvaloniaProperty.RegisterDirect<CommitBaseInfo, Models.CommitFullMessage>(
                 nameof(FullMessage),
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 6fcdad281..75543f6e1 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -6,13 +6,10 @@
              xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.CommitChanges"
-             x:DataType="vm:CommitDetail">
-  <Grid>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.CommitDetailChangesLeftWidth, Mode=TwoWay}" MinWidth="200"/>
-      <ColumnDefinition Width="4"/>
-      <ColumnDefinition Width="*" MinWidth="100"/>
-    </Grid.ColumnDefinitions>
+             x:DataType="vm:CommitDetail"
+             x:Name="ThisControl">
+  <v:ChangeListLayout IsFileListOnly="{Binding #ThisControl.IsFileListOnly}"
+                      ListWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.CommitDetailChangesLeftWidth, Mode=TwoWay}">
 
     <Grid Grid.Column="0" RowDefinitions="26,*,26">
       <!-- Search & Display Mode -->
@@ -58,7 +55,8 @@
                                   Changes="{Binding VisibleChanges, Mode=OneWay}"
                                   Selection="{Binding ChangeSelection, Mode=TwoWay}"
                                   ContextRequested="OnChangeContextRequested"
-                                  KeyDown="OnChangeCollectionViewKeyDown"/>
+                                  KeyDown="OnChangeCollectionViewKeyDown"
+                                  ChangeActivated="OnChangeActivated"/>
         </Border>
       </Border>
       
@@ -75,12 +73,13 @@
     </Grid>
 
     <GridSplitter Grid.Column="1"
+                  IsVisible="{Binding !#ThisControl.IsFileListOnly}"
                   MinWidth="1"
                   HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                   Background="Transparent"
                   Focusable="False"/>
 
-    <Grid Grid.Column="2">
+    <Grid Grid.Column="2" IsVisible="{Binding !#ThisControl.IsFileListOnly}">
       <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
         <StackPanel Orientation="Vertical" VerticalAlignment="Center">
           <Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
@@ -100,5 +99,5 @@
         </ContentControl.DataTemplates>
       </ContentControl>
     </Grid>
-  </Grid>
+  </v:ChangeListLayout>
 </UserControl>
diff --git a/src/Views/CommitChanges.axaml.cs b/src/Views/CommitChanges.axaml.cs
index 5ff13d593..0c6385f21 100644
--- a/src/Views/CommitChanges.axaml.cs
+++ b/src/Views/CommitChanges.axaml.cs
@@ -2,8 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Avalonia.VisualTree;
 
@@ -11,11 +13,26 @@ namespace SourceGit.Views
 {
     public partial class CommitChanges : UserControl
     {
+        public static readonly StyledProperty<bool> IsFileListOnlyProperty =
+            AvaloniaProperty.Register<CommitChanges, bool>(nameof(IsFileListOnly));
+
+        public bool IsFileListOnly
+        {
+            get => GetValue(IsFileListOnlyProperty);
+            set => SetValue(IsFileListOnlyProperty, value);
+        }
+
         public CommitChanges()
         {
             InitializeComponent();
         }
 
+        private void OnChangeActivated(object sender, RoutedEventArgs e)
+        {
+            if (IsFileListOnly && this.FindAncestorOfType<Histories>() is { } histories)
+                histories.OpenFocusedDiff();
+        }
+
         private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
         {
             e.Handled = true;
diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
index dd175eadd..64a8463a7 100644
--- a/src/Views/CommitDetail.axaml.cs
+++ b/src/Views/CommitDetail.axaml.cs
@@ -299,7 +299,7 @@ public ContextMenu CreateChangeContextMenu(Models.Change change)
 
         private void OnTabHeaderPointerPressed(object sender, PointerPressedEventArgs e)
         {
-            if (ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories)
+            if (ViewModels.Preferences.Instance.IsHorizontalHistoryLayout)
                 return;
 
             var historiesView = this.FindAncestorOfType<Histories>();
diff --git a/src/Views/FocusedCommitDetail.axaml b/src/Views/FocusedCommitDetail.axaml
new file mode 100644
index 000000000..496ac0053
--- /dev/null
+++ b/src/Views/FocusedCommitDetail.axaml
@@ -0,0 +1,29 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
+             xmlns:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="340" d:DesignHeight="450"
+             x:Class="SourceGit.Views.FocusedCommitDetail"
+             x:DataType="vm:CommitDetail">
+  <Grid RowDefinitions="Auto,*" Margin="8">
+    <StackPanel Grid.Row="0" Spacing="6" Margin="0,0,0,8">
+      <TextBlock Text="{Binding Commit.Subject}" FontWeight="Bold" TextWrapping="Wrap" MaxLines="2" TextTrimming="CharacterEllipsis" ToolTip.Tip="{Binding Commit.Subject}"/>
+      <Grid ColumnDefinitions="*,Auto,Auto">
+        <TextBlock Text="{Binding Commit.Author.Name}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" Foreground="{DynamicResource Brush.FG2}"/>
+        <SelectableTextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" FontFamily="{DynamicResource Fonts.Monospace}" Margin="8,0,4,0" ToolTip.Tip="{Binding Commit.SHA}"/>
+        <v:CopyButton Grid.Column="2" VerticalAlignment="Center" Width="24" Height="24" CopyText="{Binding Commit.SHA}"
+                      ToolTip.Tip="{DynamicResource Text.Histories.CopyCommitSHA}"
+                      AutomationProperties.Name="{DynamicResource Text.Histories.CopyCommitSHA}"/>
+      </Grid>
+      <Expander Header="{DynamicResource Text.CommitDetail.Info}" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+        <ScrollViewer MaxHeight="240" HorizontalScrollBarVisibility="Disabled">
+          <v:CommitBaseInfo IsCompact="True" Content="{Binding Commit}" FullMessage="{Binding FullMessage}" SignInfo="{Binding SignInfo}" WebLinks="{Binding WebLinks}"/>
+        </ScrollViewer>
+      </Expander>
+    </StackPanel>
+    <v:CommitChanges Grid.Row="1" IsFileListOnly="True"/>
+  </Grid>
+</UserControl>
diff --git a/src/Views/FocusedCommitDetail.axaml.cs b/src/Views/FocusedCommitDetail.axaml.cs
new file mode 100644
index 000000000..f8a969760
--- /dev/null
+++ b/src/Views/FocusedCommitDetail.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public partial class FocusedCommitDetail : UserControl
+    {
+        public FocusedCommitDetail()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index a3d24529f..58d3d0126 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -10,7 +10,8 @@
              x:Class="SourceGit.Views.Histories"
              x:DataType="vm:Histories"
              x:Name="ThisControl">
-  <v:HistoriesLayout UseHorizontal="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseTwoColumnsLayoutInHistories}">
+  <v:HistoriesLayout UseHorizontal="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsHorizontalHistoryLayout}"
+                     IsFocusedLayout="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsFocusedHistoryLayout}">
     <v:HistoriesLayout.RowDefinitions>
       <RowDefinition Height="{Binding TopArea, Mode=TwoWay}" MinHeight="100"/>
       <RowDefinition Height="3"/>
@@ -299,6 +300,20 @@
       </Border>
 
       <v:LoadingIcon Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>
+
+      <Grid RowDefinitions="Auto,*" Background="{DynamicResource Brush.Window}" IsVisible="{Binding IsFocusedDiffVisible}">
+        <Grid Grid.Row="0" ColumnDefinitions="*,Auto" Margin="8,4">
+          <TextBlock Text="{Binding FocusedDiffPath}" FontFamily="{DynamicResource Fonts.Monospace}" Margin="0,0,12,0" TextTrimming="CharacterEllipsis"/>
+          <Button Grid.Column="1" Content="{DynamicResource Text.Histories.BackToGraph}" Click="OnReturnToGraph" Padding="10,4"/>
+        </Grid>
+        <ContentControl Grid.Row="1" Content="{Binding FocusedDiff}">
+          <ContentControl.DataTemplates>
+            <DataTemplate DataType="vm:DiffContext">
+              <v:DiffView/>
+            </DataTemplate>
+          </ContentControl.DataTemplates>
+        </ContentControl>
+      </Grid>
     </Grid>
 
     <GridSplitter Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"
@@ -309,8 +324,22 @@
                   Focusable="False"
                   IsEnabled="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}"/>
 
-    <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" >
-      <ContentControl Content="{Binding DetailContext, Mode=OneWay}">
+    <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" RowDefinitions="Auto,*"
+          Classes.focused="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsFocusedHistoryLayout}">
+      <Grid.Styles>
+        <Style Selector="ContentControl#HistoryDetailsPresenter">
+          <Setter Property="Grid.Row" Value="0"/>
+          <Setter Property="Grid.RowSpan" Value="2"/>
+        </Style>
+        <Style Selector="Grid.focused > ContentControl#HistoryDetailsPresenter">
+          <Setter Property="Grid.Row" Value="1"/>
+          <Setter Property="Grid.RowSpan" Value="1"/>
+        </Style>
+      </Grid.Styles>
+      <TextBlock Grid.Row="0" Text="{DynamicResource Text.Histories.SelectionDetails}" Margin="8,0,36,0"
+                 Foreground="{DynamicResource Brush.FG2}"
+                 IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsFocusedHistoryLayout}"/>
+      <ContentControl x:Name="HistoryDetailsPresenter" Content="{Binding DetailContext, Mode=OneWay}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Null">
             <TabControl Padding="0,4">
@@ -351,7 +380,11 @@
           </DataTemplate>
 
           <DataTemplate DataType="vm:CommitDetail">
-            <v:CommitDetail IsDetailsPanelExpanded="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}"/>
+            <Panel>
+              <v:CommitDetail IsDetailsPanelExpanded="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}"
+                              IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsFocusedHistoryLayout, Converter={x:Static BoolConverters.Not}}"/>
+              <v:FocusedCommitDetail IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsFocusedHistoryLayout}"/>
+            </Panel>
           </DataTemplate>
 
           <DataTemplate DataType="vm:RevisionCompare">
@@ -369,7 +402,7 @@
                   </Border>
                 </TabItem.Header>
 
-                <v:RevisionCompare IsVisible="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}"/>
+                <v:RevisionCompare IsFileListOnly="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsFocusedHistoryLayout}" IsVisible="{Binding #ThisControl.IsDetailsPanelExpanded, Mode=OneWay}"/>
               </TabItem>
 
               <TabItem IsEnabled="False">
@@ -422,7 +455,7 @@
         </ContentControl.DataTemplates>
       </ContentControl>
 
-      <StackPanel Orientation="Horizontal"
+      <StackPanel Grid.Row="0" Orientation="Horizontal"
                   HorizontalAlignment="Right" VerticalAlignment="Top"
                   Margin="0,0,4,0">
         <Button Classes="icon_button"
@@ -449,7 +482,7 @@
                       Padding="0"
                       HotKey="{OnPlatform Ctrl+J, macOS=⌘+J}"
                       IsChecked="{Binding IsCollapseDetails, Mode=TwoWay}"
-                      IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseTwoColumnsLayoutInHistories, Mode=OneWay, Converter={x:Static BoolConverters.Not}}">
+                      IsVisible="{Binding Source={x:Static vm:Preferences.Instance}, Path=IsHorizontalHistoryLayout, Mode=OneWay, Converter={x:Static BoolConverters.Not}}">
           <ToolTip.Tip>
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
               <TextBlock Text="{DynamicResource Text.CommitDetail.CollapseToBottom}" VerticalAlignment="Center"/>
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index 846c59d1b..b708de999 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
@@ -18,6 +19,15 @@ namespace SourceGit.Views
 {
     public class HistoriesLayout : Grid
     {
+        public static readonly StyledProperty<bool> IsFocusedLayoutProperty =
+            AvaloniaProperty.Register<HistoriesLayout, bool>(nameof(IsFocusedLayout));
+
+        public bool IsFocusedLayout
+        {
+            get => GetValue(IsFocusedLayoutProperty);
+            set => SetValue(IsFocusedLayoutProperty, value);
+        }
+
         public static readonly DirectProperty<HistoriesLayout, bool> UseHorizontalProperty =
             AvaloniaProperty.RegisterDirect<HistoriesLayout, bool>(
                 nameof(UseHorizontal),
@@ -36,7 +46,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == UseHorizontalProperty && IsLoaded)
+            if ((change.Property == UseHorizontalProperty || change.Property == IsFocusedLayoutProperty) && IsLoaded)
                 RefreshLayout();
         }
 
@@ -48,6 +58,7 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
 
         private void RefreshLayout()
         {
+            ColumnDefinitions[2].MinWidth = IsFocusedLayout ? 260 : 100;
             if (UseHorizontal)
             {
                 var rowSpan = RowDefinitions.Count;
@@ -372,6 +383,48 @@ public bool IsDetailsPanelExpanded
         public Histories()
         {
             InitializeComponent();
+            AddHandler(KeyDownEvent, OnHistoryKeyDown, RoutingStrategies.Bubble);
+        }
+
+        public void OpenFocusedDiff()
+        {
+            if (DataContext is ViewModels.Histories vm)
+                vm.OpenFocusedDiff();
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            ViewModels.Preferences.Instance.PropertyChanged += OnHistoryLayoutChanged;
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            ViewModels.Preferences.Instance.PropertyChanged -= OnHistoryLayoutChanged;
+            base.OnDetachedFromVisualTree(e);
+        }
+
+        private void OnHistoryLayoutChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(ViewModels.Preferences.HistoryLayout) && DataContext is ViewModels.Histories vm)
+                vm.UpdateLayout();
+        }
+
+        private void OnReturnToGraph(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Histories vm)
+            {
+                vm.ShowGraph();
+                CommitListContainer.Focus();
+            }
+            e.Handled = true;
+        }
+
+        private void OnHistoryKeyDown(object sender, KeyEventArgs e)
+        {
+            if (!e.Handled && e.Key == Key.Escape && e.KeyModifiers == KeyModifiers.None &&
+                DataContext is ViewModels.Histories { IsFocusedDiffVisible: true })
+                OnReturnToGraph(sender, e);
         }
 
         public async Task GotoParent()
@@ -537,24 +590,33 @@ private void OnOpenAdvancedOptions(object sender, RoutedEventArgs e)
             layout.Header = new TextBlock() { Text = App.Text("Repository.HistoriesLayout"), FontWeight = FontWeight.Bold };
             layout.IsEnabled = false;
 
-            var isHorizontal = pref.UseTwoColumnsLayoutInHistories;
+            var isHorizontal = pref.HistoryLayout == Models.HistoryLayout.SideBySide;
             var horizontal = new MenuItem();
             horizontal.Header = App.Text("Repository.HistoriesLayout.Horizontal");
             if (isHorizontal)
                 horizontal.Icon = this.CreateMenuIcon("Icons.Check");
             horizontal.Click += (_, ev) =>
             {
-                pref.UseTwoColumnsLayoutInHistories = true;
+                pref.HistoryLayout = Models.HistoryLayout.SideBySide;
                 ev.Handled = true;
             };
 
             var vertical = new MenuItem();
             vertical.Header = App.Text("Repository.HistoriesLayout.Vertical");
-            if (!isHorizontal)
+            if (pref.HistoryLayout == Models.HistoryLayout.Stacked)
                 vertical.Icon = this.CreateMenuIcon("Icons.Check");
             vertical.Click += (_, ev) =>
             {
-                pref.UseTwoColumnsLayoutInHistories = false;
+                pref.HistoryLayout = Models.HistoryLayout.Stacked;
+                ev.Handled = true;
+            };
+
+            var focused = new MenuItem { Header = App.Text("Repository.HistoriesLayout.Focused") };
+            if (pref.IsFocusedHistoryLayout)
+                focused.Icon = this.CreateMenuIcon("Icons.Check");
+            focused.Click += (_, ev) =>
+            {
+                pref.HistoryLayout = Models.HistoryLayout.Focused;
                 ev.Handled = true;
             };
 
@@ -724,6 +786,7 @@ private void OnOpenAdvancedOptions(object sender, RoutedEventArgs e)
             menu.Items.Add(layout);
             menu.Items.Add(horizontal);
             menu.Items.Add(vertical);
+            menu.Items.Add(focused);
             menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(showFlags);
             menu.Items.Add(reflog);
@@ -858,7 +921,7 @@ private void OnCommitGraphLoaded(object sender, RoutedEventArgs e)
 
         private void OnTabHeaderPointerPressed(object sender, PointerPressedEventArgs e)
         {
-            if (ViewModels.Preferences.Instance.UseTwoColumnsLayoutInHistories)
+            if (ViewModels.Preferences.Instance.IsHorizontalHistoryLayout)
                 return;
 
             if (DataContext is not ViewModels.Histories vm)
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 23540a29e..bd9a0229d 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -795,7 +795,7 @@
                                IssueTrackers="{Binding IssueTrackers, Mode=OneWay}">
                     <v:Histories.IsDetailsPanelExpanded>
                       <MultiBinding Converter="{x:Static BoolConverters.Or}">
-                        <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseTwoColumnsLayoutInHistories" Mode="OneWay"/>
+                        <Binding Source="{x:Static vm:Preferences.Instance}" Path="IsHorizontalHistoryLayout" Mode="OneWay"/>
                         <Binding Path="IsCollapseDetails" Converter="{x:Static BoolConverters.Not}" Mode="OneWay"/>
                       </MultiBinding>
                     </v:Histories.IsDetailsPanelExpanded>
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index e76bb8796..de5cd678e 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -8,7 +8,8 @@
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RevisionCompare"
-             x:DataType="vm:RevisionCompare">
+             x:DataType="vm:RevisionCompare"
+             x:Name="ThisControl">
   <UserControl.DataTemplates>
     <DataTemplate DataType="m:Null">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
@@ -45,7 +46,7 @@
 
   <Grid RowDefinitions="Auto,*" Margin="4">
     <!-- Compare Revision Info -->
-    <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">
+    <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto" IsVisible="{Binding !#ThisControl.IsFileListOnly}">
       <!-- Base Revision -->
       <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Diff.DeletedHighlight}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
         <ContentControl Content="{Binding StartPoint}"/>
@@ -67,13 +68,22 @@
       </Button>
     </Grid>
 
+    <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto" Margin="0,0,0,8" IsVisible="{Binding #ThisControl.IsFileListOnly}">
+      <StackPanel Spacing="4">
+        <TextBlock Text="{Binding LeftSideDesc}" FontFamily="{DynamicResource Fonts.Monospace}" TextTrimming="CharacterEllipsis"/>
+        <TextBlock Text="{Binding RightSideDesc, StringFormat='→ {0}'}" FontFamily="{DynamicResource Fonts.Monospace}" TextTrimming="CharacterEllipsis"/>
+      </StackPanel>
+      <Button Grid.Column="1" Classes="icon_button" Width="28" Command="{Binding Swap}" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
+        <Path Width="16" Height="16" Data="{StaticResource Icons.Compare}"/>
+      </Button>
+      <Button Grid.Column="2" Classes="icon_button" Width="28" Click="OnSaveAsPatch" IsVisible="{Binding CanSaveAsPatch}" ToolTip.Tip="{DynamicResource Text.Diff.SaveAsPatch}">
+        <Path Width="16" Height="16" Data="{StaticResource Icons.Save}"/>
+      </Button>
+    </Grid>
+
     <!-- Changes View -->
-    <Grid Grid.Row="1">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.CommitDetailChangesLeftWidth, Mode=TwoWay}" MinWidth="200"/>
-        <ColumnDefinition Width="4"/>
-        <ColumnDefinition Width="*" MinWidth="100"/>
-      </Grid.ColumnDefinitions>
+    <v:ChangeListLayout Grid.Row="1" IsFileListOnly="{Binding #ThisControl.IsFileListOnly}"
+                        ListWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.CommitDetailChangesLeftWidth, Mode=TwoWay}">
 
       <Grid Grid.Column="0" RowDefinitions="26,*,26">
         <!-- Search & Display Mode -->
@@ -113,7 +123,8 @@
                                     Changes="{Binding VisibleChanges, Mode=OneWay}"
                                     Selection="{Binding ChangeSelection, Mode=TwoWay}"
                                     ContextRequested="OnChangeContextRequested"
-                                    KeyDown="OnChangeCollectionViewKeyDown"/>            
+                                    KeyDown="OnChangeCollectionViewKeyDown"
+                                    ChangeActivated="OnChangeActivated"/>
           </Border>
         </Border>
 
@@ -135,12 +146,13 @@
       </Grid>
 
       <GridSplitter Grid.Column="1"
+                    IsVisible="{Binding !#ThisControl.IsFileListOnly}"
                     MinWidth="1"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                     Background="Transparent"
                     Focusable="False"/>
 
-      <Grid Grid.Column="2">
+      <Grid Grid.Column="2" IsVisible="{Binding !#ThisControl.IsFileListOnly}">
         <Border CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
           <StackPanel Orientation="Vertical" VerticalAlignment="Center">
             <Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
@@ -160,6 +172,6 @@
           </ContentControl.DataTemplates>
         </ContentControl>
       </Grid>
-    </Grid>
+    </v:ChangeListLayout>
   </Grid>
 </UserControl>
diff --git a/src/Views/RevisionCompare.axaml.cs b/src/Views/RevisionCompare.axaml.cs
index 1b2a1c32f..45fd764d2 100644
--- a/src/Views/RevisionCompare.axaml.cs
+++ b/src/Views/RevisionCompare.axaml.cs
@@ -2,20 +2,37 @@
 using System.IO;
 using System.Text;
 
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
+using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
     public partial class RevisionCompare : UserControl
     {
+        public static readonly StyledProperty<bool> IsFileListOnlyProperty =
+            AvaloniaProperty.Register<RevisionCompare, bool>(nameof(IsFileListOnly));
+
+        public bool IsFileListOnly
+        {
+            get => GetValue(IsFileListOnlyProperty);
+            set => SetValue(IsFileListOnlyProperty, value);
+        }
+
         public RevisionCompare()
         {
             InitializeComponent();
         }
 
+        private void OnChangeActivated(object sender, RoutedEventArgs e)
+        {
+            if (IsFileListOnly && this.FindAncestorOfType<Histories>() is { } histories)
+                histories.OpenFocusedDiff();
+        }
+
         private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
         {
             if (DataContext is ViewModels.RevisionCompare { ChangeSelection: { Count: > 0 } selection } vm)