diff --git a/src/Views/RevisionFileTreeView.axaml b/src/Views/RevisionFileTreeView.axaml
index 7266c4295..4cebde283 100644
--- a/src/Views/RevisionFileTreeView.axaml
+++ b/src/Views/RevisionFileTreeView.axaml
@@ -8,7 +8,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RevisionFileTreeView"
              x:Name="ThisControl">
-  <v:RevisionFileRowsListBox ItemsSource="{Binding #ThisControl.Rows}"
+  <v:RevisionFileRowsListBox x:Name="RevisionFileRowsListBox" ItemsSource="{Binding #ThisControl.Rows}"
                              Background="Transparent"
                              SelectionMode="Single"
                              SelectionChanged="OnRowsSelectionChanged"
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
index 6d7265042..539d2bea7 100644
--- a/src/Views/RevisionFileTreeView.axaml.cs
+++ b/src/Views/RevisionFileTreeView.axaml.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
+
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -12,6 +14,8 @@
 using Avalonia.Platform.Storage;
 using Avalonia.VisualTree;
 
+using SourceGit.ViewModels;
+
 namespace SourceGit.Views
 {
     public class RevisionFileTreeNodeToggleButton : ToggleButton
@@ -295,6 +299,17 @@ protected override async void OnPropertyChanged(AvaloniaPropertyChangedEventArgs
 
             if (change.Property == RevisionProperty)
             {
+                var selectedNode = _revisionFileRowsListBox?.SelectedItem as RevisionFileTreeNode;
+
+                var expandedObjects = new List<Models.Object>();
+                foreach (var node in Rows)
+                {
+                    if (node.IsExpanded)
+                    {
+                        expandedObjects.Add(node.Backend);
+                    }
+                }
+
                 _tree.Clear();
                 _searchResult.Clear();
 
@@ -324,10 +339,51 @@ protected override async void OnPropertyChanged(AvaloniaPropertyChangedEventArgs
 
                 Rows.Clear();
                 Rows.AddRange(topTree);
+
+                _revisionFileRowsListBox ??= this.Find<RevisionFileRowsListBox>("RevisionFileRowsListBox");
+
+                if (_revisionFileRowsListBox is { IsArrangeValid: true })
+                {
+                    RestoreTreeState(expandedObjects, selectedNode);
+                }
+
                 GC.Collect();
             }
         }
 
+        private async void RestoreTreeState(List<Models.Object> expandedObjects, RevisionFileTreeNode selectedNode)
+        {
+            for (int i = 0; i < Rows.Count; i++)
+            {
+                var revisionFileTreeNode = Rows[i];
+
+                if (!revisionFileTreeNode.IsFolder)
+                    continue;
+
+                if (expandedObjects.FirstOrDefault(o => o.SHA == revisionFileTreeNode.Backend.SHA || o.Path == revisionFileTreeNode.Backend.Path) != null)
+                {
+                    await ToggleNodeIsExpandedAsync(revisionFileTreeNode);
+                }
+            }
+
+            if (selectedNode != null)
+            {
+                foreach (var node in Rows)
+                {
+                    if (node.Backend.SHA != selectedNode.Backend.SHA && node.Backend.Path != selectedNode.Backend.Path)
+                        continue;
+
+                    selectedNode = node;
+                    break;
+                }
+            }
+
+            if (_revisionFileRowsListBox != null)
+            {
+                _revisionFileRowsListBox.SelectedItem = selectedNode;
+            }
+        }
+
         private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs e)
         {
             if (DataContext is ViewModels.CommitDetail { Repository: ViewModels.Repository repo, Commit: Models.Commit commit } vm &&
@@ -671,5 +727,6 @@ public ContextMenu CreateRevisionFileContextMenu(ViewModels.Repository repo, Vie
         private List<ViewModels.RevisionFileTreeNode> _tree = [];
         private bool _disableSelectionChangingEvent = false;
         private List<ViewModels.RevisionFileTreeNode> _searchResult = [];
+        private RevisionFileRowsListBox _revisionFileRowsListBox;
     }
 }