diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 66291659a..c49ac5fe7 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -662,8 +662,7 @@ private void CalcRevisionFileSearchSuggestion()
             var suggestion = new List<string>();
             foreach (var file in _revisionFiles)
             {
-                if (file.Contains(_revisionFileSearchFilter, StringComparison.OrdinalIgnoreCase) &&
-                    file.Length != _revisionFileSearchFilter.Length)
+                if (file.Contains(_revisionFileSearchFilter, StringComparison.OrdinalIgnoreCase))
                     suggestion.Add(file);
 
                 if (suggestion.Count >= 100)
diff --git a/src/Views/RevisionFileTreeView.axaml b/src/Views/RevisionFileTreeView.axaml
index 025ba4d79..4d4c9d034 100644
--- a/src/Views/RevisionFileTreeView.axaml
+++ b/src/Views/RevisionFileTreeView.axaml
@@ -8,7 +8,8 @@
              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="RowsList"
+                             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 953aeff54..395e26b17 100644
--- a/src/Views/RevisionFileTreeView.axaml.cs
+++ b/src/Views/RevisionFileTreeView.axaml.cs
@@ -268,7 +268,6 @@ public RevisionFileTreeView()
 
         public async Task SetSearchResultAsync(string file)
         {
-            Rows.Clear();
             _searchResult.Clear();
 
             var rows = new List<ViewModels.RevisionFileTreeNode>();
@@ -324,7 +323,27 @@ public async Task SetSearchResultAsync(string file)
                 MakeRows(rows, _searchResult, 0);
             }
 
-            Rows.AddRange(rows);
+            _disableSelectionChangingEvent = true;
+            try
+            {
+                Rows.Clear();
+                Rows.AddRange(rows);
+            }
+            finally
+            {
+                _disableSelectionChangingEvent = false;
+            }
+
+            if (!string.IsNullOrEmpty(file))
+            {
+                var target = rows.Find(x => !x.IsFolder);
+                if (target != null)
+                {
+                    RowsList.SelectedItem = target;
+                    RowsList.ScrollIntoView(target);
+                }
+            }
+
             GC.Collect();
         }
 
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 9ff113c57..80ce1f980 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -63,6 +63,7 @@
                            ItemsSource="{Binding RevisionFileSearchSuggestion}"
                            MaxHeight="400"
                            Focusable="True"
+                           SelectionChanged="OnSearchSuggestionSelectionChanged"
                            KeyDown="OnSearchSuggestionBoxKeyDown">
                 <ListBox.Styles>
                   <Style Selector="ListBoxItem">
diff --git a/src/Views/RevisionFiles.axaml.cs b/src/Views/RevisionFiles.axaml.cs
index aa274f1d9..7ae50a3db 100644
--- a/src/Views/RevisionFiles.axaml.cs
+++ b/src/Views/RevisionFiles.axaml.cs
@@ -50,6 +50,12 @@ private async void OnSearchBoxTextChanged(object _, TextChangedEventArgs e)
                 await FileTree.SetSearchResultAsync(null);
         }
 
+        private async void OnSearchSuggestionSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is ListBox { SelectedItem: string content } && !string.IsNullOrEmpty(content))
+                await FileTree.SetSearchResultAsync(content);
+        }
+
         private async void OnSearchSuggestionBoxKeyDown(object _, KeyEventArgs e)
         {
             if (DataContext is not ViewModels.CommitDetail vm)
@@ -62,9 +68,9 @@ private async void OnSearchSuggestionBoxKeyDown(object _, KeyEventArgs e)
             }
             else if (e.Key == Key.Enter && SearchSuggestionBox.SelectedItem is string content)
             {
-                vm.RevisionFileSearchFilter = content;
-                TxtSearchRevisionFiles.CaretIndex = content.Length;
-                await FileTree.SetSearchResultAsync(vm.RevisionFileSearchFilter);
+                await FileTree.SetSearchResultAsync(content);
+                vm.CancelRevisionFileSuggestions();
+                TxtSearchRevisionFiles.Focus();
                 e.Handled = true;
             }
         }
@@ -77,9 +83,9 @@ private async void OnSearchSuggestionTapped(object sender, TappedEventArgs e)
             var content = (sender as StackPanel)?.DataContext as string;
             if (!string.IsNullOrEmpty(content))
             {
-                vm.RevisionFileSearchFilter = content;
-                TxtSearchRevisionFiles.CaretIndex = content.Length;
-                await FileTree.SetSearchResultAsync(vm.RevisionFileSearchFilter);
+                await FileTree.SetSearchResultAsync(content);
+                vm.CancelRevisionFileSuggestions();
+                TxtSearchRevisionFiles.Focus();
             }
 
             e.Handled = true;