diff --git a/src/Commands/QueryHistoryQuickSearch.cs b/src/Commands/QueryHistoryQuickSearch.cs
new file mode 100644
index 000000000..3117b9bef
--- /dev/null
+++ b/src/Commands/QueryHistoryQuickSearch.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SourceGit.Commands
+{
+    // Search only the commits currently loaded in history, including their full messages.
+    public class QueryHistoryQuickSearch : Command
+    {
+        public QueryHistoryQuickSearch(string repo, IReadOnlyList<Models.Commit> commits, string filter, CancellationToken cancellationToken)
+        {
+            WorkingDirectory = repo;
+            Context = repo;
+            Args = "log --no-walk=unsorted --stdin --no-show-signature --format=%H%x00%aN%x00%aE%x00%B%x00";
+            CancellationToken = cancellationToken;
+            _commits = commits;
+            _filter = filter;
+        }
+
+        public async Task<HashSet<string>> GetResultAsync()
+        {
+            var matches = new HashSet<string>(StringComparer.Ordinal);
+            if (_filter.Length == 0 || _commits.Count == 0)
+                return matches;
+
+            CancellationToken.ThrowIfCancellationRequested();
+            using var proc = new Process();
+            proc.StartInfo = CreateGitStartInfo(true);
+            proc.StartInfo.RedirectStandardInput = true;
+            proc.Start();
+            var input = WriteCommitsAsync(proc);
+            var errors = proc.StandardError.ReadToEndAsync(CancellationToken);
+            try
+            {
+                // Stream NUL-delimited fields as Mixed search does. One Git process handles
+                // the loaded history, without retaining every full message in memory.
+                var fields = new string[4];
+                var fieldIndex = 0;
+                var field = new StringBuilder();
+                var buffer = new char[4096];
+                int count;
+                while ((count = await proc.StandardOutput.ReadAsync(buffer.AsMemory(), CancellationToken).ConfigureAwait(false)) > 0)
+                {
+                    for (var i = 0; i < count; i++)
+                    {
+                        if (buffer[i] != '\0')
+                        {
+                            field.Append(buffer[i]);
+                            continue;
+                        }
+
+                        fields[fieldIndex++] = field.ToString();
+                        field.Clear();
+                        if (fieldIndex < fields.Length)
+                            continue;
+
+                        var sha = fields[0].TrimStart('\r', '\n');
+                        // Same literal, case-insensitive OR matching as Commit Search's Mixed mode.
+                        if (sha.StartsWith(_filter, StringComparison.OrdinalIgnoreCase) ||
+                            (fields[1] + "±" + fields[2]).Contains(_filter, StringComparison.OrdinalIgnoreCase) ||
+                            fields[3].Contains(_filter, StringComparison.OrdinalIgnoreCase))
+                            matches.Add(sha);
+                        fieldIndex = 0;
+                    }
+                }
+                await proc.WaitForExitAsync(CancellationToken).ConfigureAwait(false);
+                var error = await errors.ConfigureAwait(false);
+                if (proc.ExitCode != 0)
+                    throw new InvalidOperationException(error);
+                await input.ConfigureAwait(false);
+            }
+            finally
+            {
+                try
+                {
+                    if (!proc.HasExited)
+                        proc.Kill(true);
+                }
+                catch (InvalidOperationException)
+                {
+                    // The process may have exited between HasExited and Kill.
+                }
+                await proc.WaitForExitAsync().ConfigureAwait(false);
+                // Observe the input/error tasks even when Git exits early or the query is cancelled.
+                try
+                {
+                    await input.ConfigureAwait(false);
+                }
+                catch (Exception)
+                {
+                    // Preserve the original query error.
+                }
+                try
+                {
+                    await errors.ConfigureAwait(false);
+                }
+                catch (OperationCanceledException)
+                {
+                    // The query was superseded.
+                }
+            }
+            return matches;
+        }
+
+        private async Task WriteCommitsAsync(Process proc)
+        {
+            foreach (var commit in _commits)
+                await proc.StandardInput.WriteLineAsync(commit.SHA.AsMemory(), CancellationToken).ConfigureAwait(false);
+            proc.StandardInput.Close();
+        }
+
+        private readonly IReadOnlyList<Models.Commit> _commits;
+        private readonly string _filter;
+    }
+}
diff --git a/src/Models/CommitGraph.cs b/src/Models/CommitGraph.cs
index 916a79b1b..ec5101747 100644
--- a/src/Models/CommitGraph.cs
+++ b/src/Models/CommitGraph.cs
@@ -71,7 +71,95 @@ public class Dot
         public List<Link> Links { get; } = [];
         public List<Dot> Dots { get; } = [];
 
+        public static CommitGraph GenerateFiltered(List<Commit> allCommits, List<Commit> visibleCommits, bool firstParentOnlyEnabled, CommitGraphHighlighting highlighting, HashSet<string> highlightExtraCommits)
+        {
+            var visible = new HashSet<string>();
+            foreach (var commit in visibleCommits)
+                visible.Add(commit.SHA);
+
+            var visibleOrder = new Dictionary<string, int>();
+            for (var i = 0; i < visibleCommits.Count; i++)
+                visibleOrder[visibleCommits[i].SHA] = i;
+
+            var nearest = new Dictionary<string, List<string>>();
+            var parents = new Dictionary<string, List<string>>();
+            // History is ordered children before parents. Resolve hidden ancestors from
+            // oldest to newest, stopping each path at its first visible commit.
+            for (var i = allCommits.Count - 1; i >= 0; i--)
+            {
+                var commit = allCommits[i];
+                var parentCount = firstParentOnlyEnabled ? Math.Min(1, commit.Parents.Count) : commit.Parents.Count;
+                List<string> resolved = [];
+                if (parentCount == 1)
+                {
+                    if (nearest.TryGetValue(commit.Parents[0], out var ancestors))
+                        resolved = ancestors;
+                }
+                else if (parentCount > 1)
+                {
+                    var seen = new HashSet<string>();
+                    for (var j = 0; j < parentCount; j++)
+                    {
+                        if (!nearest.TryGetValue(commit.Parents[j], out var ancestors))
+                            continue;
+
+                        foreach (var ancestor in ancestors)
+                        {
+                            if (seen.Add(ancestor))
+                                resolved.Add(ancestor);
+                        }
+                    }
+                }
+
+                if (parentCount > 1 && resolved.Count > 1)
+                {
+                    // Hidden merges can expose both a visible commit and its ancestors.
+                    // Keep only the nearest targets: the older targets are already
+                    // reachable through the nearer ones and would add redundant lanes.
+                    var candidates = new HashSet<string>(resolved);
+                    var redundant = new HashSet<string>();
+                    var visited = new HashSet<string>();
+                    var pending = new Stack<string>();
+                    var oldest = 0;
+                    foreach (var target in resolved)
+                    {
+                        oldest = Math.Max(oldest, visibleOrder[target]);
+                        foreach (var parent in parents[target])
+                            pending.Push(parent);
+                    }
+                    while (pending.TryPop(out var ancestor))
+                    {
+                        if (visibleOrder[ancestor] > oldest || !visited.Add(ancestor))
+                            continue;
+
+                        if (candidates.Contains(ancestor))
+                            redundant.Add(ancestor);
+                        foreach (var parent in parents[ancestor])
+                            pending.Push(parent);
+                    }
+                    resolved.RemoveAll(redundant.Contains);
+                }
+
+                if (visible.Contains(commit.SHA))
+                {
+                    parents[commit.SHA] = resolved;
+                    nearest[commit.SHA] = [commit.SHA];
+                }
+                else
+                {
+                    nearest[commit.SHA] = resolved;
+                }
+            }
+
+            return Generate(visibleCommits, firstParentOnlyEnabled, highlighting, highlightExtraCommits, parents);
+        }
+
         public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEnabled, CommitGraphHighlighting highlighting, HashSet<string> highlightExtraCommits)
+        {
+            return Generate(commits, firstParentOnlyEnabled, highlighting, highlightExtraCommits, null);
+        }
+
+        private static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEnabled, CommitGraphHighlighting highlighting, HashSet<string> highlightExtraCommits, Dictionary<string, List<string>> parentOverrides)
         {
             const double unitWidth = 12;
             const double halfWidth = 6;
@@ -87,6 +175,7 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
 
             foreach (var commit in commits)
             {
+                var parents = parentOverrides != null && parentOverrides.TryGetValue(commit.SHA, out var projected) ? projected : commit.Parents;
                 PathHelper major = null;
 
                 // Update current y offset
@@ -106,9 +195,9 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                             major = l;
                             isHighlighted = major.IsHighlighted;
 
-                            if (commit.Parents.Count > 0)
+                            if (parents.Count > 0)
                             {
-                                major.Next = commit.Parents[0];
+                                major.Next = parents[0];
                                 major.Goto(offsetX, offsetY, halfHeight);
                             }
                             else
@@ -155,8 +244,8 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                             {
                                 isHighlighted = true;
                                 // Highlight first parent, other parents are dealt with later
-                                if (commit.Parents.Count > 0)
-                                    highlightExtraCommits.Add(commit.Parents[0]);
+                                if (parents.Count > 0)
+                                    highlightExtraCommits.Add(parents[0]);
                             }
                             break;
                         default: // CommitGraphHighlighting.CurrentBranchAndSelectedCommits
@@ -168,8 +257,8 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                             {
                                 isHighlighted = true;
                                 // Highlight first parent, other parents are dealt with later
-                                if (commit.Parents.Count > 0)
-                                    highlightExtraCommits.Add(commit.Parents[0]);
+                                if (parents.Count > 0)
+                                    highlightExtraCommits.Add(parents[0]);
                             }
                             break;
                     }
@@ -182,14 +271,14 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                 {
                     offsetX += unitWidth;
 
-                    if (commit.Parents.Count > 0)
+                    if (parents.Count > 0)
                     {
-                        major = new PathHelper(commit.Parents[0], isHighlighted, colorPicker.Next(), new Point(offsetX, offsetY));
+                        major = new PathHelper(parents[0], isHighlighted, colorPicker.Next(), new Point(offsetX, offsetY));
                         unsolved.Add(major);
                         temp.Paths.Add(major.Path);
                     }
                 }
-                else if (isHighlighted && !major.IsHighlighted && commit.Parents.Count > 0)
+                else if (isHighlighted && !major.IsHighlighted && parents.Count > 0)
                 {
                     major.Highlight();
                     temp.Paths.Add(major.Path);
@@ -213,9 +302,9 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                     if (highlighting == CommitGraphHighlighting.SelectedCommitsOnlyFirstParent)
                         isHighlighted = false;
 
-                    for (int j = 1; j < commit.Parents.Count; j++)
+                    for (int j = 1; j < parents.Count; j++)
                     {
-                        var parentHash = commit.Parents[j];
+                        var parentHash = parents[j];
                         var parent = unsolved.Find(x => x.Next.Equals(parentHash, StringComparison.Ordinal));
                         if (parent != null)
                         {
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 62ac98e48..f6efba83e 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -535,6 +535,10 @@
   <x:String x:Key="Text.Histories.HighlightsInGraph.CurrentBranchAndSelectedCommits" xml:space="preserve">Current Branch &amp; Selected Commits</x:String>
   <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.QuickSearch" xml:space="preserve">Quick search (Mixed)</x:String>
+  <x:String x:Key="Text.Histories.QuickSearch.Filter" xml:space="preserve">Show matching commits only</x:String>
+  <x:String x:Key="Text.Histories.QuickSearch.Next" xml:space="preserve">Next match (F3 / Enter)</x:String>
+  <x:String x:Key="Text.Histories.QuickSearch.Previous" xml:space="preserve">Previous match (Shift+F3 / Shift+Enter)</x:String>
   <x:String x:Key="Text.Histories.Selected" xml:space="preserve">SELECTED {0} COMMITS</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>
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index d1ba76c82..c2c5e13b3 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -584,6 +584,16 @@
     <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
     <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
   </Style>
+  <Style Selector="Window[IsActive=False] TextBox">
+    <Setter Property="CaretBrush" Value="Transparent"/>
+    <Setter Property="SelectionBrush" Value="{DynamicResource Brush.Border2}"/>
+    <Setter Property="SelectionForegroundBrush" Value="{DynamicResource Brush.FG1}"/>
+  </Style>
+  <Style Selector="Window[IsActive=False] TextBox:not(:disabled) /template/ Border#PART_BorderElement">
+    <Setter Property="BorderBrush" Value="{Binding $parent[TextBox].BorderBrush}"/>
+    <Setter Property="BorderThickness" Value="{Binding $parent[TextBox].BorderThickness}"/>
+    <Setter Property="Background" Value="{Binding $parent[TextBox].Background}"/>
+  </Style>
   <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="Opacity" Value=".6"/>
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 36b97c898..be8e16654 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -9,6 +9,7 @@
       <Color x:Key="Color.Popup">#FFFAFAFA</Color>
       <Color x:Key="Color.PopupBorder">#FFFFFFFF</Color>
       <Color x:Key="Color.Contents">#FFFFFFFF</Color>
+      <Color x:Key="Color.Histories.FilteredBackground">#FFFFF9E6</Color>
       <Color x:Key="Color.Badge">#FFB0CEE8</Color>
       <Color x:Key="Color.BadgeFG">#FF1F1F1F</Color>
       <Color x:Key="Color.Conflict">#FF836C2E</Color>
@@ -43,6 +44,7 @@
       <Color x:Key="Color.Popup">#FF2B2B2B</Color>
       <Color x:Key="Color.PopupBorder">#FF393939</Color>
       <Color x:Key="Color.Contents">#FF1C1C1C</Color>
+      <Color x:Key="Color.Histories.FilteredBackground">#FF302D20</Color>
       <Color x:Key="Color.Badge">#FF8F8F8F</Color>
       <Color x:Key="Color.BadgeFG">#FFE0E0E0</Color>
       <Color x:Key="Color.Conflict">#FFFAFAD2</Color>
@@ -77,6 +79,7 @@
   <SolidColorBrush x:Key="Brush.Popup" Color="{DynamicResource Color.Popup}"/>
   <SolidColorBrush x:Key="Brush.PopupBorder" Color="{DynamicResource Color.PopupBorder}"/>
   <SolidColorBrush x:Key="Brush.Contents" Color="{DynamicResource Color.Contents}"/>
+  <SolidColorBrush x:Key="Brush.Histories.FilteredBackground" Color="{DynamicResource Color.Histories.FilteredBackground}"/>
   <SolidColorBrush x:Key="Brush.Badge" Color="{DynamicResource Color.Badge}"/>
   <SolidColorBrush x:Key="Brush.BadgeFG" Color="{DynamicResource Color.BadgeFG}"/>
   <SolidColorBrush x:Key="Brush.Conflict" Color="{DynamicResource Color.Conflict}"/>
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 128b53ff9..62b4d6d2d 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia.Collections;
@@ -107,9 +108,182 @@ public List<Models.Commit> Commits
             get => _commits;
             set
             {
-                GenerateGraph(value);
                 if (SetProperty(ref _commits, value))
-                    PostCommitsChanged();
+                    RefreshQuickSearch(true);
+            }
+        }
+
+        public bool IsUpdatingQuickSearchFilter { get; private set; }
+
+        public List<Models.Commit> DisplayedCommits => _displayedCommits;
+
+        public string QuickSearchText
+        {
+            get => _quickSearchText;
+            set
+            {
+                if (SetProperty(ref _quickSearchText, value))
+                {
+                    OnPropertyChanged(nameof(IsQuickSearchFilterActive));
+                    RefreshQuickSearch();
+                }
+            }
+        }
+
+        public bool IsQuickSearchFilterEnabled
+        {
+            get => _isQuickSearchFilterEnabled;
+            set
+            {
+                if (SetProperty(ref _isQuickSearchFilterEnabled, value))
+                {
+                    OnPropertyChanged(nameof(IsQuickSearchFilterActive));
+                    ApplyQuickSearchFilter();
+                }
+            }
+        }
+
+        public bool IsQuickSearchFilterActive => _isQuickSearchFilterEnabled && !string.IsNullOrEmpty(_quickSearchText);
+
+        public bool IsQuickSearching
+        {
+            get => _isQuickSearching;
+            private set => SetProperty(ref _isQuickSearching, value);
+        }
+
+        public bool HasQuickSearchMatches => !IsQuickSearching && _quickSearchMatches.Count > 0;
+
+        public string QuickSearchStatus => string.IsNullOrEmpty(_quickSearchText) ? string.Empty :
+            $"{(_selectedCommits.Count == 1 ? _quickSearchMatches.FindIndex(c => c.SHA == _selectedCommits[0].SHA) + 1 : 0)} / {_quickSearchMatches.Count}";
+
+        public void ClearQuickSearch()
+        {
+            IsQuickSearchFilterEnabled = false;
+            QuickSearchText = string.Empty;
+        }
+
+        public void QuickSearchNext() => MoveQuickSearch(1);
+        public void QuickSearchPrevious() => MoveQuickSearch(-1);
+
+        private void MoveQuickSearch(int direction)
+        {
+            if (!HasQuickSearchMatches)
+                return;
+
+            var current = _selectedCommits.Count == 1 ? _commits.IndexOf(_selectedCommits[0]) : -1;
+            if (current < 0)
+                current = direction > 0 ? -1 : 0;
+
+            var matches = new HashSet<Models.Commit>(_quickSearchMatches);
+            for (var step = 1; step <= _commits.Count; step++)
+            {
+                var index = (current + direction * step + _commits.Count) % _commits.Count;
+                if (matches.Contains(_commits[index]))
+                {
+                    SelectedCommits = [_commits[index]];
+                    return;
+                }
+            }
+        }
+
+        private async void RefreshQuickSearch(bool commitsChanged = false)
+        {
+            _quickSearchCancellation?.Cancel();
+            if (string.IsNullOrEmpty(_quickSearchText))
+                _quickSearchMatches = [];
+            else if (commitsChanged)
+            {
+                var previousMatches = new HashSet<string>(_quickSearchMatches.ConvertAll(c => c.SHA));
+                _quickSearchMatches = _commits.FindAll(c => previousMatches.Contains(c.SHA));
+            }
+            IsQuickSearching = !string.IsNullOrEmpty(_quickSearchText) && _commits.Count > 0;
+            OnPropertyChanged(nameof(HasQuickSearchMatches));
+            OnPropertyChanged(nameof(QuickSearchStatus));
+            ApplyQuickSearchFilter();
+            if (!IsQuickSearching)
+            {
+                if (!string.IsNullOrEmpty(_quickSearchText))
+                    SelectedCommits = [];
+                return;
+            }
+
+            var cancellation = new CancellationTokenSource();
+            _quickSearchCancellation = cancellation;
+            var commits = _commits;
+            var filter = _quickSearchText;
+            try
+            {
+                await Task.Delay(200, cancellation.Token);
+                var matches = await Task.Run(() => new Commands.QueryHistoryQuickSearch(_repo.FullPath, commits, filter, cancellation.Token).GetResultAsync());
+                if (cancellation.IsCancellationRequested)
+                    return;
+
+                _quickSearchMatches = commits.FindAll(c => matches.Contains(c.SHA));
+                IsQuickSearching = false;
+                ApplyQuickSearchFilter();
+                if (_quickSearchMatches.Count > 0)
+                {
+                    var selected = _selectedCommits.Count == 1 ?
+                        _quickSearchMatches.Find(c => c.SHA == _selectedCommits[0].SHA) : null;
+                    SelectedCommits = [selected ?? _quickSearchMatches[0]];
+                }
+                else
+                {
+                    SelectedCommits = [];
+                }
+                OnPropertyChanged(nameof(HasQuickSearchMatches));
+                OnPropertyChanged(nameof(QuickSearchStatus));
+            }
+            catch (OperationCanceledException)
+            {
+                // A newer query or leaving the view supersedes this search.
+            }
+            catch (Exception e)
+            {
+                if (!cancellation.IsCancellationRequested)
+                {
+                    _quickSearchMatches = [];
+                    IsQuickSearching = false;
+                    ApplyQuickSearchFilter();
+                    OnPropertyChanged(nameof(HasQuickSearchMatches));
+                    OnPropertyChanged(nameof(QuickSearchStatus));
+                    Models.Notification.Send(_repo.FullPath, e.Message, true);
+                }
+            }
+            finally
+            {
+                if (_quickSearchCancellation == cancellation)
+                    _quickSearchCancellation = null;
+                cancellation.Dispose();
+            }
+        }
+
+        public void CancelQuickSearch()
+        {
+            _quickSearchCancellation?.Cancel();
+            IsQuickSearching = false;
+            OnPropertyChanged(nameof(HasQuickSearchMatches));
+        }
+
+        public void ResumeQuickSearch() => RefreshQuickSearch();
+
+        private void ApplyQuickSearchFilter()
+        {
+            var visible = IsQuickSearchFilterActive ? _quickSearchMatches : _commits;
+            if (ReferenceEquals(visible, _displayedCommits))
+                return;
+
+            _displayedCommits = visible;
+            IsUpdatingQuickSearchFilter = true;
+            try
+            {
+                GenerateGraph(DisplayedCommits);
+                OnPropertyChanged(nameof(DisplayedCommits));
+                PostCommitsChanged();
+            }
+            finally
+            {
+                IsUpdatingQuickSearchFilter = false;
             }
         }
 
@@ -127,7 +301,7 @@ public Models.CommitGraphHighlighting GraphHighlighting
                 if (_repo.UIStates.GraphHighlighting != value)
                 {
                     _repo.UIStates.GraphHighlighting = value;
-                    GenerateGraph(_commits);
+                    GenerateGraph(DisplayedCommits);
                 }
             }
         }
@@ -299,6 +473,8 @@ public void NavigateTo(string commitSHA)
             var commit = _commits.Find(x => x.SHA.StartsWith(commitSHA, StringComparison.Ordinal));
             if (commit != null)
             {
+                if (!DisplayedCommits.Contains(commit))
+                    IsQuickSearchFilterEnabled = false;
                 SelectedCommits = [commit];
                 return;
             }
@@ -494,7 +670,7 @@ private void PostCommitsChanged()
             if (_selectedCommits.Count == 0)
                 return;
 
-            if (_commits.Count == 0 || _selectedCommits.Count > 20)
+            if (DisplayedCommits.Count == 0 || _selectedCommits.Count > 20)
             {
                 SelectedCommits = [];
                 return;
@@ -505,7 +681,7 @@ private void PostCommitsChanged()
                 set.Add(c.SHA);
 
             var selected = new List<Models.Commit>();
-            foreach (var c in _commits)
+            foreach (var c in DisplayedCommits)
             {
                 if (set.Contains(c.SHA))
                 {
@@ -521,6 +697,7 @@ private void PostCommitsChanged()
 
         private void PostSelectedCommitsChanged()
         {
+            OnPropertyChanged(nameof(QuickSearchStatus));
             if (_ignoreSelectionChange)
                 return;
 
@@ -559,7 +736,7 @@ private void PostSelectedCommitsChanged()
             }
 
             if (_repo.UIStates.GraphHighlighting >= Models.CommitGraphHighlighting.SelectedCommitsOnly)
-                GenerateGraph(_commits);
+                GenerateGraph(DisplayedCommits);
         }
 
         private void GenerateGraph(List<Models.Commit> commits)
@@ -574,9 +751,18 @@ private void GenerateGraph(List<Models.Commit> commits)
                     extraHeads.Add(c.SHA);
             }
 
-            Graph = Models.CommitGraph.Generate(commits, firstParentOnly, highlighting, extraHeads);
+            Graph = IsQuickSearchFilterActive ?
+                Models.CommitGraph.GenerateFiltered(_commits, commits, firstParentOnly, highlighting, extraHeads) :
+                Models.CommitGraph.Generate(commits, firstParentOnly, highlighting, extraHeads);
         }
 
+        private string _quickSearchText = string.Empty;
+        private bool _isQuickSearchFilterEnabled = false;
+        private bool _isQuickSearching = false;
+        private List<Models.Commit> _displayedCommits = [];
+        private List<Models.Commit> _quickSearchMatches = [];
+        private CancellationTokenSource _quickSearchCancellation;
+
         private Repository _repo = null;
         private Models.Branch _currentBranch = null;
         private bool _hasSingleRemote = false;
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 1ea5951a8..067e53a1b 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -479,6 +479,7 @@ public void Close()
             if (_cancellationRefreshStashes is { IsCancellationRequested: false })
                 _cancellationRefreshStashes.Cancel();
 
+            _histories?.CancelQuickSearch();
             _watcher?.Dispose();
             _autoFetchTimer.Dispose();
         }
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index a3d24529f..9305fed49 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -23,13 +23,73 @@
       <ColumnDefinition Width="{Binding RightArea, Mode=TwoWay}" MinWidth="100"/>
     </v:HistoriesLayout.ColumnDefinitions>
 
-    <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
-      <v:HistoriesCommitList x:Name="CommitListContainer"
+    <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" RowDefinitions="Auto,*" x:Name="HistoryListArea">
+      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto,100" Height="34" Margin="0,0,4,0"
+            HorizontalAlignment="Left" MaxWidth="640" Width="{Binding #HistoryListArea.Bounds.Width}">
+        <StackPanel Orientation="Horizontal"
+                    Height="18"
+                    Margin="4,0,0,0"
+                    VerticalAlignment="Center"
+                    Spacing="6">
+          <ToggleButton Classes="line_path" Width="18" IsChecked="{Binding IsSearchingCommits, Mode=TwoWay}">
+            <ToolTip.Tip>
+              <TextBlock>
+                <Run Text="{DynamicResource Text.Repository.Search.ToolTip}" Foreground="{DynamicResource Brush.FG1}"/>
+                <Run Text=" "/>
+                <Run Text="{OnPlatform Ctrl+Shift+F, macOS=⌘+⇧+F}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+              </TextBlock>
+            </ToolTip.Tip>
+            <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
+          </ToggleButton>
+
+          <Button Classes="icon_button"
+                  Width="18" Height="18"
+                  HorizontalAlignment="Left" VerticalAlignment="Center"
+                  Click="OnOpenAdvancedOptions"
+                  ToolTip.Tip="{DynamicResource Text.Histories.AdvancedOptions}">
+            <Path Width="12" Height="12"
+                  Data="{StaticResource Icons.Settings2}"/>
+          </Button>
+        </StackPanel>
+        <TextBox Grid.Column="1" x:Name="QuickSearchBox" Height="26" MinWidth="80"
+                 HorizontalAlignment="Stretch" Margin="10,0,4,0" CornerRadius="13" BorderThickness="1"
+                 BorderBrush="{DynamicResource Brush.Border2}" VerticalContentAlignment="Center"
+                 ToolTip.Tip="{OnPlatform Ctrl+F, macOS=⌘+F}"
+                 Watermark="{DynamicResource Text.Histories.QuickSearch}"
+                 Text="{Binding QuickSearchText, Mode=TwoWay}">
+          <TextBox.InnerLeftContent>
+            <Path Width="14" Height="14" Margin="6,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
+          </TextBox.InnerLeftContent>
+          <TextBox.InnerRightContent>
+            <Button Classes="icon_button" Focusable="False" Width="16" Margin="0,0,6,0"
+                    Command="{Binding ClearQuickSearch}" IsVisible="{Binding QuickSearchText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+              <Path Width="12" Height="12" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Clear}"/>
+            </Button>
+          </TextBox.InnerRightContent>
+        </TextBox>
+        <ToggleButton Grid.Column="2" Classes="line_path" Width="24" Height="24" Focusable="False"
+                      IsChecked="{Binding IsQuickSearchFilterEnabled, Mode=TwoWay}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Filter}">
+          <Path Width="14" Height="14" Data="{StaticResource Icons.Filter}"/>
+        </ToggleButton>
+        <Button Grid.Column="3" Classes="icon_button" Width="24" Focusable="False" Command="{Binding QuickSearchPrevious}"
+                IsEnabled="{Binding HasQuickSearchMatches}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Previous}">
+          <Path Width="12" Height="12" Data="{StaticResource Icons.Up}"/>
+        </Button>
+        <Button Grid.Column="4" Classes="icon_button" Width="24" Focusable="False" Command="{Binding QuickSearchNext}"
+                IsEnabled="{Binding HasQuickSearchMatches}" ToolTip.Tip="{DynamicResource Text.Histories.QuickSearch.Next}">
+          <Path Width="12" Height="12" Data="{StaticResource Icons.Down}"/>
+        </Button>
+        <TextBlock IsVisible="{Binding !IsQuickSearching}" Grid.Column="5" Text="{Binding QuickSearchStatus}" Margin="4,0" VerticalAlignment="Center"
+                     TextTrimming="CharacterEllipsis" ToolTip.Tip="{Binding QuickSearchStatus}"/>
+        <v:LoadingIcon Grid.Column="5" Width="14" Height="14" Margin="4,0" HorizontalAlignment="Left" IsVisible="{Binding IsQuickSearching}"/>
+      </Grid>
+
+      <v:HistoriesCommitList Grid.Row="1" x:Name="CommitListContainer"
                              Classes="static_scrollbar"
+                             Classes.filtering="{Binding IsQuickSearchFilterActive}"
                              ScrollViewer.AllowAutoHide="False"
-                             Background="Transparent"
-                             ItemsSource="{Binding Commits, Mode=OneWay}"
-                             TotalCommits="{Binding Commits.Count, Mode=OneWay}"
+                             ItemsSource="{Binding DisplayedCommits, Mode=OneWay}"
+                             TotalCommits="{Binding DisplayedCommits.Count, Mode=OneWay}"
                              SelectedCommits="{Binding SelectedCommits, Mode=TwoWay}"
                              ColumnHeaderHeight="24"
                              RowHeight="26"
@@ -38,23 +98,29 @@
                              DoubleTapped="OnCommitListDoubleTapped">
         <DataGrid.Styles>
           <Style Selector="DataGrid.static_scrollbar">
+            <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
             <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
               <Setter Property="Grid.RowSpan" Value="1" />
               <Setter Property="Grid.ColumnSpan" Value="2" />
-              <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+              <Setter Property="Background" Value="{Binding #CommitListContainer.Background}"/>
             </Style>
             <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
               <Setter Property="Grid.Column" Value="0" />
+              <Setter Property="Background" Value="{DynamicResource Brush.SubPanel}"/>
             </Style>
             <Style Selector="^ /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
               <Setter Property="Fill" Value="{DynamicResource Brush.Border0}"/>
               <Setter Property="Height" Value="0.65"/>
             </Style>
             <Style Selector="^ /template/ ScrollBar">
-              <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
+              <Setter Property="Background" Value="{Binding #CommitListContainer.Background}"/>
             </Style>
           </Style>
 
+          <Style Selector="DataGrid.static_scrollbar.filtering">
+            <Setter Property="Background" Value="{DynamicResource Brush.Histories.FilteredBackground}"/>
+          </Style>
+
           <Style Selector="DataGridColumnHeader">
             <Setter Property="MinHeight" Value="24"/>
             <Setter Property="Background" Value="Transparent"/>
@@ -105,7 +171,7 @@
         <DataGrid.Columns>
           <DataGridTemplateColumn Width="*" IsReadOnly="True">
             <DataGridTemplateColumn.Header>
-              <Border Padding="48,0">
+              <Border Padding="8,0">
                 <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
               </Border>
             </DataGridTemplateColumn.Header>
@@ -121,13 +187,13 @@
                                              VerticalAlignment="Center"/>
 
                     <v:BisectStateIndicator Grid.Column="1"
-                                            Background="{DynamicResource Brush.Contents}"
+                                            Background="{Binding #CommitListContainer.Background}"
                                             Foreground="{DynamicResource Brush.FG1}"
                                             Bisect="{Binding $parent[v:Histories].Bisect}"
                                             VerticalAlignment="Center"/>
 
                     <v:CommitRefsPresenter Grid.Column="2"
-                                           Background="{DynamicResource Brush.Contents}"
+                                           Background="{Binding #CommitListContainer.Background}"
                                            Foreground="{DynamicResource Brush.FG1}"
                                            ShowTags="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsInGraph}"
                                            FontSize="12"
@@ -242,49 +308,23 @@
         </DataGrid.Columns>
       </v:HistoriesCommitList>
 
-      <Border Background="Transparent"
+      <Border Grid.Row="1" Background="Transparent"
               Height="24"
               HorizontalAlignment="Stretch" VerticalAlignment="Top"
               PointerMoved="OnCommitListHeaderPointerMoved"
               PointerPressed="OnCommitListHeaderPointerPressed"
-              PointerReleased="OnCommitListHeaderPointerReleased">
-        <StackPanel Orientation="Horizontal"
-                    Height="18"
-                    Margin="4,0,0,0"
-                    VerticalAlignment="Center"
-                    Spacing="6">
-          <ToggleButton Classes="line_path" Width="18" IsChecked="{Binding IsSearchingCommits, Mode=TwoWay}">
-            <ToolTip.Tip>
-              <TextBlock>
-                <Run Text="{DynamicResource Text.Repository.Search.ToolTip}" Foreground="{DynamicResource Brush.FG1}"/>
-                <Run Text=" "/>
-                <Run Text="{OnPlatform Ctrl+Shift+F, macOS=⌘+⇧+F}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
-              </TextBlock>
-            </ToolTip.Tip>
-            <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
-          </ToggleButton>
-          
-          <Button Classes="icon_button"
-                  Width="18" Height="18"
-                  HorizontalAlignment="Left" VerticalAlignment="Center"
-                  Click="OnOpenAdvancedOptions"
-                  ToolTip.Tip="{DynamicResource Text.Histories.AdvancedOptions}">
-            <Path Width="12" Height="12"
-                  Data="{StaticResource Icons.Settings2}"/>
-          </Button>
-        </StackPanel>
-      </Border>
+              PointerReleased="OnCommitListHeaderPointerReleased"/>
 
-      <v:CommitGraph x:Name="CommitGraph"
+      <v:CommitGraph Grid.Row="1" x:Name="CommitGraph"
                      Margin="0,24,0,0"
                      Graph="{Binding Graph}"
-                     DotBrush="{DynamicResource Brush.Contents}"
+                     DotBrush="{Binding #CommitListContainer.Background}"
                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                      IsHitTestVisible="False"
                      ClipToBounds="True"
                      Loaded="OnCommitGraphLoaded"/>
 
-      <Border Width="28" Height="28"
+      <Border Grid.Row="1" Width="28" Height="28"
               Margin="0,0,16,8"
               CornerRadius="14"
               Background="{DynamicResource Brush.Popup}"
@@ -298,7 +338,7 @@
               Opacity=".8"/>
       </Border>
 
-      <v:LoadingIcon Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>
+      <v:LoadingIcon Grid.Row="1" Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>
     </Grid>
 
     <GridSplitter Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index 846c59d1b..3db0d948b 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -139,7 +139,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             {
                 if (change.OldValue is List<Models.Commit> { Count: 1 } old &&
                     change.NewValue is List<Models.Commit> { Count: 1 } cur &&
-                    old[0] == cur[0])
+                    old[0] == cur[0] && DataContext is not ViewModels.Histories { IsUpdatingQuickSearchFilter: true })
                     ScrollIntoView(old[0], null);
                 else
                     ApplySelection();
@@ -150,6 +150,9 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
         {
             base.OnSelectionChanged(e);
 
+            if (_ignoreSelectionChanged || DataContext is ViewModels.Histories { IsUpdatingQuickSearchFilter: true })
+                return;
+
             if (ItemsSource is not IList<Models.Commit> items)
                 return;
 
@@ -268,6 +271,9 @@ private void ApplySelection()
             }
 
             _ignoreSelectionChanged = false;
+
+            if (SelectedCommits is { Count: 1 })
+                ScrollIntoView(SelectedCommits[0], null);
         }
 
         private void IncrNoSelectionChangeCount()
@@ -372,6 +378,61 @@ public bool IsDetailsPanelExpanded
         public Histories()
         {
             InitializeComponent();
+            AddHandler(KeyDownEvent, OnQuickSearchKeyDown, RoutingStrategies.Tunnel);
+            Loaded += OnQuickSearchLoaded;
+            Unloaded += OnQuickSearchUnloaded;
+        }
+
+        public void FocusQuickSearch()
+        {
+            if (TopLevel.GetTopLevel(this) is Window { IsActive: false })
+                return;
+
+            QuickSearchBox.Focus();
+            QuickSearchBox.SelectAll();
+        }
+
+        private void OnQuickSearchLoaded(object sender, RoutedEventArgs e)
+        {
+            (DataContext as ViewModels.Histories)?.ResumeQuickSearch();
+        }
+
+        private void OnQuickSearchUnloaded(object sender, RoutedEventArgs e)
+        {
+            (DataContext as ViewModels.Histories)?.CancelQuickSearch();
+        }
+
+        private void OnQuickSearchKeyDown(object sender, KeyEventArgs e)
+        {
+            if (DataContext is not ViewModels.Histories vm)
+                return;
+
+            if (!QuickSearchBox.IsKeyboardFocusWithin &&
+                e.Source is Visual source && source != CommitListContainer && !CommitListContainer.IsVisualAncestorOf(source))
+                return;
+
+            var command = OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
+            if (e.Key == Key.F && e.KeyModifiers == command)
+            {
+                FocusQuickSearch();
+                e.Handled = true;
+            }
+            else if ((e.Key == Key.F3 && (e.KeyModifiers == KeyModifiers.None || e.KeyModifiers == KeyModifiers.Shift)) ||
+                     (e.Key == Key.Enter && QuickSearchBox.IsKeyboardFocusWithin &&
+                      (e.KeyModifiers == KeyModifiers.None || e.KeyModifiers == KeyModifiers.Shift)))
+            {
+                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
+                    vm.QuickSearchPrevious();
+                else
+                    vm.QuickSearchNext();
+                e.Handled = true;
+            }
+            else if (e.Key == Key.Escape && (!string.IsNullOrEmpty(vm.QuickSearchText) || vm.IsQuickSearchFilterEnabled))
+            {
+                vm.ClearQuickSearch();
+                CommitListContainer.Focus();
+                e.Handled = true;
+            }
         }
 
         public async Task GotoParent()
@@ -789,8 +850,8 @@ private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
 
         private void OnScrollToTopPointerPressed(object sender, PointerPressedEventArgs e)
         {
-            if (DataContext is ViewModels.Histories histories)
-                CommitListContainer.ScrollIntoView(histories.Commits[0], null);
+            if (DataContext is ViewModels.Histories histories && histories.DisplayedCommits.Count > 0)
+                CommitListContainer.ScrollIntoView(histories.DisplayedCommits[0], null);
         }
 
         private void OnCommitListContextRequested(object sender, ContextRequestedEventArgs e)
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index e15ff1764..b447d1397 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -89,7 +89,7 @@
                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
                    Margin="0,8"/>
 
-        <Grid RowDefinitions="20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
+        <Grid RowDefinitions="20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+1, macOS=⌘+1}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewDashboard}" />
 
@@ -140,6 +140,12 @@
 
           <TextBlock Grid.Row="16" Grid.Column="0" Classes="bold" Text="F5"/>
           <TextBlock Grid.Row="16" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Refresh}" />
+          <TextBlock Grid.Row="17" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
+          <TextBlock Grid.Row="17" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Histories.QuickSearch}"/>
+          <TextBlock Grid.Row="18" Grid.Column="0" Classes="bold" Text="Shift+F3 / Shift+Enter"/>
+          <TextBlock Grid.Row="18" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Histories.QuickSearch.Previous}"/>
+          <TextBlock Grid.Row="19" Grid.Column="0" Classes="bold" Text="F3 / Enter"/>
+          <TextBlock Grid.Row="19" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Histories.QuickSearch.Next}"/>
         </Grid>
       </StackPanel>
     </Border>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 0ac14e6bb..e1d2877f2 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -5,6 +5,7 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
@@ -271,6 +272,17 @@ protected override async void OnKeyDown(KeyEventArgs e)
                             vm.CommandPalette = new ViewModels.RepositoryCommandPalette(repo);
                             e.Handled = true;
                             return;
+                        case Key.F when e.KeyModifiers == cmdKey && repo.IsDashboardVisible:
+                            foreach (var visual in this.GetVisualDescendants())
+                            {
+                                if (visual is Histories histories && histories.DataContext == repo.Histories && histories.IsVisible)
+                                {
+                                    histories.FocusQuickSearch();
+                                    e.Handled = true;
+                                    return;
+                                }
+                            }
+                            break;
                         case Key.F when e.KeyModifiers.HasFlag(KeyModifiers.Shift):
                             repo.Histories.IsSearchingCommits = !repo.Histories.IsSearchingCommits;
                             e.Handled = true;
diff --git a/tests/HistoryQuickSearchChecks/HistoryQuickSearchChecks.csproj b/tests/HistoryQuickSearchChecks/HistoryQuickSearchChecks.csproj
new file mode 100644
index 000000000..cbfcb000e
--- /dev/null
+++ b/tests/HistoryQuickSearchChecks/HistoryQuickSearchChecks.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../src/SourceGit.csproj" />
+    <PackageReference Include="Avalonia.Headless" Version="11.3.22" />
+  </ItemGroup>
+</Project>
diff --git a/tests/HistoryQuickSearchChecks/Program.cs b/tests/HistoryQuickSearchChecks/Program.cs
new file mode 100644
index 000000000..64fca2079
--- /dev/null
+++ b/tests/HistoryQuickSearchChecks/Program.cs
@@ -0,0 +1,485 @@
+using System.Diagnostics;
+using System.Reflection;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Headless;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using SourceGit.Commands;
+using SourceGit.Models;
+using SourceGit.ViewModels;
+using Commit = SourceGit.Models.Commit;
+using HistoryView = SourceGit.Views.Histories;
+
+internal static class Program
+{
+    private static int _checks;
+
+    private static void Main(string[] args)
+    {
+        var fixture = Path.Combine(Path.GetTempPath(), "sourcegit-history-search-" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(fixture);
+        SourceGit.Native.OS.GitExecutable = "git";
+        SourceGit.Native.OS.BasicDirectories.ConfigDir = fixture;
+        SourceGit.Native.OS.BasicDirectories.CacheDir = fixture;
+        typeof(Preferences).GetField("_instance", BindingFlags.NonPublic | BindingFlags.Static)!.SetValue(null, new Preferences());
+        AppBuilder.Configure<SourceGit.App>().UseSkia().WithInterFont()
+            .ConfigureFonts(manager => manager.AddFontCollection(new Avalonia.Media.Fonts.EmbeddedFontCollection(
+                new Uri("fonts:SourceGit"), new Uri("avares://SourceGit/Resources/Fonts"))))
+            .UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false }).SetupWithoutStarting();
+        try
+        {
+            if (args.Length >= 2 && args[0] == "--repository")
+            {
+                CheckRepositoryGraph(args[1], args.Length > 2 ? args[2] : null);
+                return;
+            }
+            Git(fixture, "init", "-b", "main");
+            Git(fixture, "config", "user.name", "Alice Shared");
+            Git(fixture, "config", "user.email", "alice@example.com");
+            Git(fixture, "commit", "--allow-empty", "-m", "Shared Alpha Subject", "-m", "Body-only needle\nLiteral [brackets]. and a \"quote\"\nUnicode: \u00e1rv\u00edzt\u0171r\u0151\n" + new string('x', 9000) + "long-body needle");
+            var first = Git(fixture, "rev-parse", "HEAD").Trim();
+            Git(fixture, "config", "user.name", "Bob");
+            Git(fixture, "config", "user.email", "bob@example.com");
+            Git(fixture, "commit", "--allow-empty", "-m", "Shared second");
+            var second = Git(fixture, "rev-parse", "HEAD").Trim();
+            Git(fixture, "checkout", "-b", "other");
+            Git(fixture, "commit", "--allow-empty", "-m", "Outside the loaded history");
+            var outside = Git(fixture, "rev-parse", "HEAD").Trim();
+            Git(fixture, "checkout", "main");
+            var commits = new QueryCommits(fixture, "HEAD").GetResultAsync().GetAwaiter().GetResult();
+            Check(Search(fixture, commits, first[..12].ToUpperInvariant()).SetEquals([first]), "SHA prefix ignores case");
+            Check(Search(fixture, commits, first.Substring(8, 14)).Count == 0, "interior SHA does not match");
+            Check(Search(fixture, commits, "ALICE").SetEquals([first]), "author name");
+            Check(Search(fixture, commits, "BOB@EXAMPLE.COM").SetEquals([second]), "author email");
+            Check(Search(fixture, commits, "alpha subject").SetEquals([first]), "subject ignores case");
+            Check(Search(fixture, commits, "body-only NEEDLE").SetEquals([first]), "full multiline message");
+            Check(Search(fixture, commits, "long-body needle").SetEquals([first]), "large message");
+            Check(Search(fixture, commits, "[brackets].").SetEquals([first]), "literal punctuation");
+            Check(Search(fixture, commits, "\u00e1rv\u00edzt\u0171r\u0151").SetEquals([first]), "Unicode");
+            Check(Search(fixture, commits, "Shared").Count == 2, "OR matching across author and message");
+            Check(Search(fixture, commits, outside).Count == 0, "only loaded history searched");
+            Check(Search(fixture, commits, "").Count == 0, "empty query");
+            Check(Search(fixture, [], "Shared").Count == 0, "empty history does not default to HEAD");
+            var batched = Enumerable.Repeat(commits[0], 256).Append(commits[1]).ToList();
+            Check(Search(fixture, batched, "body-only").SetEquals([first]), "matches beyond the first 256 entries");
+            using (var cancelled = new CancellationTokenSource())
+            {
+                cancelled.Cancel();
+                try
+                {
+                    new QueryHistoryQuickSearch(fixture, commits, "Shared", cancelled.Token).GetResultAsync().GetAwaiter().GetResult();
+                    throw new Exception("Cancelled query completed");
+                }
+                catch (OperationCanceledException) { Check(true, "cancelled query"); }
+            }
+
+            using (var cancellation = new CancellationTokenSource())
+            {
+                var manyCommits = Enumerable.Repeat(commits[0], 20000).ToList();
+                var pending = new QueryHistoryQuickSearch(fixture, manyCommits, "Shared", cancellation.Token).GetResultAsync();
+                cancellation.Cancel();
+                try
+                {
+                    pending.WaitAsync(TimeSpan.FromSeconds(5)).GetAwaiter().GetResult();
+                    throw new Exception("Running query was not cancelled");
+                }
+                catch (OperationCanceledException) { Check(true, "running Git query cancels promptly"); }
+            }
+
+            var repo = new Repository(false, fixture, Path.Combine(fixture, ".git"));
+            var histories = new Histories(repo) { Commits = commits, IsLoading = false };
+            // Avoid unrelated detail loading; selection still drives search navigation and status.
+            typeof(Histories).GetField("_ignoreSelectionChange", BindingFlags.NonPublic | BindingFlags.Instance)!.SetValue(histories, true);
+            histories.QuickSearchText = "Shared";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.HasQuickSearchMatches && histories.DisplayedCommits.Count == 2, "search retains unfiltered history");
+            Check(histories.SelectedCommits.Single().SHA == second, "search selects first match automatically");
+            histories.SelectedCommits = [];
+            histories.QuickSearchNext();
+            Check(histories.SelectedCommits.Single().SHA == second, "next selects first in history order");
+            histories.QuickSearchNext();
+            Check(histories.SelectedCommits.Single().SHA == first, "next selects second match");
+            histories.QuickSearchNext();
+            Check(histories.SelectedCommits.Single().SHA == second, "next wraps");
+            histories.QuickSearchPrevious();
+            Check(histories.SelectedCommits.Single().SHA == first, "previous wraps");
+            Check(histories.QuickSearchStatus == "2 / 2", "match counter follows selection");
+            var unfilteredGraph = histories.Graph;
+            histories.QuickSearchText = "body-only";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(ReferenceEquals(unfilteredGraph, histories.Graph), "unfiltered search does not rebuild graph");
+            histories.IsQuickSearchFilterEnabled = true;
+            Check(histories.DisplayedCommits.Single().SHA == first && histories.Commits.Count == 2, "filter preserves source history");
+            histories.QuickSearchText = "second";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.DisplayedCommits.Single().SHA == second, "filtered graph tolerates hidden parent");
+            histories.IsQuickSearchFilterEnabled = false;
+            Check(histories.DisplayedCommits.Count == 2, "filter toggle restores history");
+            histories.QuickSearchText = "missing";
+            histories.QuickSearchText = "Shared";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.HasQuickSearchMatches, "new query wins over cancelled query");
+            histories.Commits = [commits[0]];
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.QuickSearchStatus.EndsWith("/ 1"), "history refresh recomputes matches");
+            histories.Commits = commits;
+            WaitFor(() => !histories.IsQuickSearching);
+
+            histories.SelectedCommits = [commits[1]];
+            var view = new HistoryView { DataContext = histories };
+            var sidebarSearch = new TextBox { Watermark = "Sidebar search" };
+            var shell = new Grid { RowDefinitions = RowDefinitions.Parse("28,*") };
+            shell.Children.Add(sidebarSearch);
+            Grid.SetRow(view, 1);
+            shell.Children.Add(view);
+            var window = new Window { Width = 1000, Height = 650, Content = shell };
+            window.Show();
+            SetWindowActive(window, true);
+            Dispatcher.UIThread.RunJobs();
+            WaitFor(() => !histories.IsQuickSearching);
+            view.FindControl<DataGrid>("CommitListContainer")!.Focus();
+            window.KeyPressQwerty(PhysicalKey.F, RawInputModifiers.Control);
+            var box = view.FindControl<TextBox>("QuickSearchBox")!;
+            Check(box.IsKeyboardFocusWithin, "Ctrl+F target focuses search");
+            view.FindControl<DataGrid>("CommitListContainer")!.Focus();
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.None);
+            Check(histories.SelectedCommits.Single().SHA == second, "F3 selects next match from the commit list");
+            Check(!box.IsKeyboardFocusWithin, "F3 keeps focus in the commit list");
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.Shift);
+            Check(histories.SelectedCommits.Single().SHA == first, "Shift+F3 selects previous match from the commit list");
+            window.KeyPressQwerty(PhysicalKey.F, RawInputModifiers.Control);
+            Check(box.IsKeyboardFocusWithin && Math.Abs(box.SelectionEnd - box.SelectionStart) == box.Text.Length,
+                "Ctrl+F focuses quick search and selects its text");
+            window.KeyTextInput("body-only");
+            Check(histories.QuickSearchText == "body-only", "typing immediately after Ctrl+F replaces the search query");
+            WaitFor(() => !histories.IsQuickSearching);
+            sidebarSearch.Focus();
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.None);
+            Check(sidebarSearch.IsKeyboardFocusWithin && histories.SelectedCommits.Single().SHA == first,
+                "F3 in the sidebar does not activate history search");
+            view.IsVisible = false;
+            sidebarSearch.Focus();
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.None);
+            Check(sidebarSearch.IsKeyboardFocusWithin, "hidden history does not intercept F3");
+            view.IsVisible = true;
+            box.Focus();
+            histories.QuickSearchText = "Shared";
+            WaitFor(() => !histories.IsQuickSearching);
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.None);
+            Check(histories.SelectedCommits.Single().SHA == second && box.IsKeyboardFocusWithin,
+                "F3 selects next match while retaining search-box focus");
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.Shift);
+            Check(histories.SelectedCommits.Single().SHA == first, "Shift+F3 selects previous match in search box");
+            window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None);
+            Check(histories.SelectedCommits.Single().SHA == second, "Enter selects next match");
+            window.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.Shift);
+            Check(histories.SelectedCommits.Single().SHA == first, "Shift+F3 selects previous match");
+            histories.IsQuickSearchFilterEnabled = true;
+            box.Focus();
+            Dispatcher.UIThread.RunJobs();
+            var border = box.GetVisualDescendants().OfType<Border>().First(b => b.Name == "PART_BorderElement");
+            Check(histories.SelectedCommits.Single().SHA == first, "filter toggle preserves visible selection");
+            foreach (var theme in new[] { Avalonia.Styling.ThemeVariant.Light, Avalonia.Styling.ThemeVariant.Dark })
+            {
+                Application.Current!.RequestedThemeVariant = theme;
+                Dispatcher.UIThread.RunJobs();
+                box.Focus();
+                var textPresenter = box.GetVisualDescendants().OfType<Avalonia.Controls.Presenters.TextPresenter>()
+                    .Single(p => p.Name == "PART_TextPresenter");
+                SetWindowActive(window, false);
+                Dispatcher.UIThread.RunJobs();
+                Check(!window.IsActive && textPresenter.CaretBrush is ISolidColorBrush inactiveCaret && inactiveCaret.Color.A == 0,
+                    $"{theme}: inactive window hides the search caret");
+                Check(border.BorderBrush is ISolidColorBrush inactiveBorder && box.BorderBrush is ISolidColorBrush normalBorder &&
+                    inactiveBorder.Color == normalBorder.Color, $"{theme}: inactive search uses its normal border instead of active focus styling");
+                Check(box.SelectionBrush is ISolidColorBrush selectionBrush && box.BorderBrush is ISolidColorBrush borderBrush &&
+                    selectionBrush.Color == borderBrush.Color, $"{theme}: inactive text selection uses a neutral highlight");
+                if (args.Length > 0)
+                {
+                    window.UpdateLayout();
+                    AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+                    using var inactiveFrame = window.CaptureRenderedFrame();
+                    inactiveFrame!.Save(Path.Combine(Path.GetDirectoryName(args[0])!, $"history-inactive-{theme.ToString().ToLowerInvariant()}.png"));
+                }
+                var otherInput = new TextBox();
+                var otherWindow = new Window { Width = 200, Height = 80, Content = otherInput };
+                otherWindow.Show();
+                SetWindowActive(otherWindow, true);
+                otherInput.Focus();
+                var previousQuery = histories.QuickSearchText;
+                otherWindow.KeyPressQwerty(PhysicalKey.F3, RawInputModifiers.None);
+                otherWindow.KeyTextInput("another window");
+                Check(histories.QuickSearchText == previousQuery && otherInput.Text == "another window" &&
+                    textPresenter.CaretBrush is ISolidColorBrush hiddenCaret && hiddenCaret.Color.A == 0,
+                    $"{theme}: keys in another window do not activate or edit history search");
+                otherWindow.Close();
+                SetWindowActive(window, true);
+                box.Focus();
+                Dispatcher.UIThread.RunJobs();
+                Check((textPresenter.CaretBrush ?? textPresenter.Foreground) is ISolidColorBrush activeCaret && activeCaret.Color.A > 0,
+                    $"{theme}: reactivating the window restores the caret");
+                var list = view.FindControl<DataGrid>("CommitListContainer")!;
+                var tinted = theme == Avalonia.Styling.ThemeVariant.Light ? Color.Parse("#FFFFF9E6") : Color.Parse("#FF302D20");
+                var normal = theme == Avalonia.Styling.ThemeVariant.Light ? Color.Parse("#FFFFFFFF") : Color.Parse("#FF1C1C1C");
+                var presenter = list.GetVisualDescendants().OfType<Avalonia.Controls.Primitives.DataGridRowsPresenter>().Single();
+                Check(list.Background is ISolidColorBrush background && background.Color == tinted &&
+                    presenter.Background is ISolidColorBrush rows && rows.Color == tinted, $"{theme}: active filter tints history rows");
+                var headers = list.GetVisualDescendants().OfType<Avalonia.Controls.Primitives.DataGridColumnHeadersPresenter>().Single();
+                var headerColor = theme == Avalonia.Styling.ThemeVariant.Light ? Color.Parse("#FFFBFBFB") : Color.Parse("#FF272727");
+                Check(headers.Background is ISolidColorBrush headerBrush && headerBrush.Color == headerColor,
+                    $"{theme}: column headers retain normal background during filtering");
+                Check(border.Background is not ISolidColorBrush input || input.Color != tinted && input.Color != Color.Parse("#FFF2CC"),
+                    $"{theme}: search field keeps normal theme background");
+                var graph = view.FindControl<SourceGit.Views.CommitGraph>("CommitGraph")!;
+                Check(graph.DotBrush is ISolidColorBrush dots && dots.Color == tinted, $"{theme}: graph dots use history background");
+                histories.IsQuickSearchFilterEnabled = false;
+                Dispatcher.UIThread.RunJobs();
+                Check(list.Background is ISolidColorBrush unfiltered && unfiltered.Color == normal, $"{theme}: query without filter has no tint");
+                histories.IsQuickSearchFilterEnabled = true;
+                histories.QuickSearchText = string.Empty;
+                Dispatcher.UIThread.RunJobs();
+                Check(!histories.IsQuickSearchFilterActive && list.Background is ISolidColorBrush empty && empty.Color == normal,
+                    $"{theme}: enabled filter with empty query has no tint");
+                histories.QuickSearchText = "body-only";
+                WaitFor(() => !histories.IsQuickSearching);
+                Check(histories.IsQuickSearchFilterActive && list.Background is ISolidColorBrush restored && restored.Color == tinted,
+                    $"{theme}: editing nonempty query restores active tint");
+                var clearButton = (Button)box.InnerRightContent!;
+                var clearIcon = (Avalonia.Controls.Shapes.Path)clearButton.Content!;
+                Check(clearButton.IsVisible && clearIcon.Fill is ISolidColorBrush iconBrush && iconBrush.Color.A > 0,
+                    $"{theme}: nonempty search shows a visible clear icon");
+                window.UpdateLayout();
+                var clearPoint = clearButton.TranslatePoint(new Point(clearButton.Bounds.Width / 2, clearButton.Bounds.Height / 2), window)!.Value;
+                window.MouseDown(clearPoint, MouseButton.Left, RawInputModifiers.None);
+                window.MouseUp(clearPoint, MouseButton.Left, RawInputModifiers.None);
+                Dispatcher.UIThread.RunJobs();
+                Check(histories.QuickSearchText.Length == 0 && box.Text.Length == 0 && histories.DisplayedCommits.Count == 2,
+                    $"{theme}: one click clears search and restores history");
+                Check(!clearButton.IsVisible && box.IsKeyboardFocusWithin, $"{theme}: empty search hides clear icon and retains focus");
+                histories.QuickSearchText = "body-only";
+                histories.IsQuickSearchFilterEnabled = true;
+                WaitFor(() => !histories.IsQuickSearching);
+            }
+            Application.Current!.RequestedThemeVariant = Avalonia.Styling.ThemeVariant.Light;
+            Dispatcher.UIThread.RunJobs();
+            if (args.Length > 0)
+            {
+                AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+                using var frame = window.CaptureRenderedFrame();
+                frame?.Save(args[0]);
+                Avalonia.Application.Current!.RequestedThemeVariant = Avalonia.Styling.ThemeVariant.Dark;
+                Dispatcher.UIThread.RunJobs();
+                AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+                using var darkFrame = window.CaptureRenderedFrame();
+                darkFrame?.Save(Path.Combine(Path.GetDirectoryName(args[0])!, "history-quick-search-dark.png"));
+            }
+            window.KeyPressQwerty(PhysicalKey.Escape, RawInputModifiers.None);
+            Check(histories.QuickSearchText.Length == 0 && !histories.IsQuickSearchFilterEnabled && histories.DisplayedCommits.Count == 2, "Escape clears search and restores history");
+            view.FindControl<DataGrid>("CommitListContainer")!.Focus();
+            window.KeyPressQwerty(PhysicalKey.F, RawInputModifiers.Control);
+            Check(box.IsKeyboardFocusWithin, "Ctrl+F works from commit list after clearing");
+            histories.QuickSearchText = "Shared";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.SelectedCommits.Count == 1, "matching query selects a row before no-match edit");
+            histories.QuickSearchText = "no such commit";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.SelectedCommits.Count == 0 && view.FindControl<DataGrid>("CommitListContainer")!.SelectedItems.Count == 0 &&
+                histories.DisplayedCommits.Count == 2, "no-match edit clears selection without filtering");
+            histories.IsQuickSearchFilterEnabled = true;
+            Check(histories.DisplayedCommits.Count == 0 && !histories.HasQuickSearchMatches, "no matches produces empty filtered history");
+            histories.QuickSearchText = "Shared";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.SelectedCommits.Count == 1, "matching query restores selection while filtered");
+            histories.QuickSearchText = "no such filtered commit";
+            WaitFor(() => !histories.IsQuickSearching);
+            Check(histories.SelectedCommits.Count == 0 && view.FindControl<DataGrid>("CommitListContainer")!.SelectedItems.Count == 0,
+                "no-match edit clears selection while filtered");
+            histories.ClearQuickSearch();
+            for (var i = 0; i < 60; i++)
+                Git(fixture, "commit", "--allow-empty", "-m", $"Filler {i}");
+            Git(fixture, "commit", "--allow-empty", "-m", "Body-only distant match");
+            var longHistory = new QueryCommits(fixture, "HEAD").GetResultAsync().GetAwaiter().GetResult();
+            histories.Commits = longHistory;
+            histories.SelectedCommits = [];
+            var grid = view.FindControl<DataGrid>("CommitListContainer")!;
+            Dispatcher.UIThread.RunJobs();
+            window.UpdateLayout();
+            grid.ScrollIntoView(longHistory[^1], null);
+            Dispatcher.UIThread.RunJobs();
+            window.UpdateLayout();
+            Check(!IsRowVisible(grid, longHistory[0]), "first match starts outside viewport");
+            histories.QuickSearchText = "body-only";
+            WaitFor(() => !histories.IsQuickSearching);
+            window.UpdateLayout();
+            Check(IsRowVisible(grid, longHistory[0]), "initial search scrolls first match into view");
+            histories.QuickSearchNext();
+            Dispatcher.UIThread.RunJobs();
+            window.UpdateLayout();
+            Check(histories.SelectedCommits.Single() == longHistory[^1] && IsRowVisible(grid, longHistory[^1]), "next scrolls distant match into view");
+            histories.QuickSearchPrevious();
+            Dispatcher.UIThread.RunJobs();
+            window.UpdateLayout();
+            Check(histories.SelectedCommits.Single() == longHistory[0] && IsRowVisible(grid, longHistory[0]), "previous scrolls distant match into view");
+            histories.IsQuickSearchFilterEnabled = true;
+            Check(histories.Graph.Dots.Count == 2 && histories.Graph.Dots.All(dot => dot.Center.X == 10), "filtered linear history stays in one lane across hidden commits");
+            Check(histories.Graph.Paths.Count == 1, "filtered matches share their ancestral path");
+            histories.IsQuickSearchFilterEnabled = false;
+            Check(longHistory[0].Parents.Single() == longHistory[1].SHA, "filtering preserves original parent hashes");
+            Dispatcher.UIThread.RunJobs();
+            window.UpdateLayout();
+            Check(IsRowVisible(grid, histories.SelectedCommits.Single()), "filter toggle keeps selected match visible");
+            CheckFilteredGraphTopology();
+            window.Close();
+            histories.CancelQuickSearch();
+            Console.WriteLine($"Passed {_checks} history quick search checks.");
+        }
+        finally
+        {
+            // Git object files are read-only on Windows. This fixture was created above.
+            var tempRoot = Path.GetFullPath(Path.GetTempPath());
+            if (!Path.GetFullPath(fixture).StartsWith(tempRoot, StringComparison.OrdinalIgnoreCase) ||
+                !Path.GetFileName(fixture).StartsWith("sourcegit-history-search-", StringComparison.Ordinal))
+                throw new InvalidOperationException("Unexpected fixture path");
+            foreach (var file in Directory.EnumerateFiles(fixture, "*", SearchOption.AllDirectories))
+                File.SetAttributes(file, FileAttributes.Normal);
+            Directory.Delete(fixture, true);
+        }
+    }
+
+    private static void CheckRepositoryGraph(string path, string preview)
+    {
+        var commits = new QueryCommits(path, "--branches --remotes --tags HEAD --date-order -20000").GetResultAsync().GetAwaiter().GetResult();
+        var matches = Search(path, commits, "fix:");
+        var visible = commits.FindAll(c => matches.Contains(c.SHA));
+        var full = CommitGraph.Generate(commits, false, CommitGraphHighlighting.All, []);
+        var filtered = CommitGraph.GenerateFiltered(commits, visible, false, CommitGraphHighlighting.All, []);
+        var fullWidth = full.Dots.Max(dot => dot.Center.X);
+        var filteredWidth = filtered.Dots.Max(dot => dot.Center.X);
+        Console.WriteLine($"Repository: {commits.Count} commits, {visible.Count} matches; full width {fullWidth}, filtered width {filteredWidth}");
+        if (preview != null)
+        {
+            var repo = new Repository(false, path, Path.Combine(path, ".git"));
+            var histories = new Histories(repo) { Commits = commits, IsLoading = false, IsCollapseDetails = true };
+            typeof(Histories).GetField("_ignoreSelectionChange", BindingFlags.NonPublic | BindingFlags.Instance)!.SetValue(histories, true);
+            var view = new HistoryView { DataContext = histories };
+            var window = new Window { Width = 1600, Height = 1000, Content = view };
+            Application.Current!.RequestedThemeVariant = Avalonia.Styling.ThemeVariant.Dark;
+            window.Show();
+            histories.QuickSearchText = "fix:";
+            histories.IsQuickSearchFilterEnabled = true;
+            WaitFor(() => !histories.IsQuickSearching);
+            window.UpdateLayout();
+            AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+            using var frame = window.CaptureRenderedFrame();
+            frame!.Save(preview);
+            histories.SelectedCommits = [histories.DisplayedCommits[^1]];
+            Dispatcher.UIThread.RunJobs();
+            window.UpdateLayout();
+            AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+            using var bottom = window.CaptureRenderedFrame();
+            bottom!.Save(Path.Combine(Path.GetDirectoryName(preview)!, Path.GetFileNameWithoutExtension(preview) + "-bottom.png"));
+            window.Close();
+            histories.CancelQuickSearch();
+        }
+        Check(filteredWidth <= fullWidth + 12, "real repository filtered graph does not grow phantom lanes");
+    }
+
+    private static void CheckFilteredGraphTopology()
+    {
+        var root = new Commit { SHA = "root" };
+        var left = new Commit { SHA = "left", Parents = [root.SHA] };
+        var right = new Commit { SHA = "right", Parents = [root.SHA] };
+        var hiddenMerge = new Commit { SHA = "hidden-merge", Parents = [left.SHA, right.SHA] };
+        var tip = new Commit { SHA = "tip", Parents = [hiddenMerge.SHA] };
+        var all = new List<Commit> { tip, hiddenMerge, left, right, root };
+        var graph = CommitGraph.GenerateFiltered(all, [tip, left, right, root], false, CommitGraphHighlighting.All, []);
+        Check(graph.Dots.Count == 4 && graph.Paths.Count == 2, "hidden merge retains both visible parent paths");
+        Check(graph.Dots.Max(dot => dot.Center.X) <= 22, "hidden merge does not create extra lanes");
+        graph = CommitGraph.GenerateFiltered(all, [tip, right], true, CommitGraphHighlighting.All, []);
+        Check(graph.Paths.Count == 0, "first-parent mode does not connect through a hidden second parent");
+        graph = CommitGraph.GenerateFiltered(all, [tip], false, CommitGraphHighlighting.All, []);
+        Check(graph.Paths.Count == 0 && graph.Dots.Single().Center.X == 10, "no dangling paths for ancestors without visible matches");
+        Check(hiddenMerge.Parents.SequenceEqual([left.SHA, right.SHA]), "projecting hidden merges preserves original ancestry");
+        var chain = Enumerable.Range(0, 200).Select(i => new Commit { SHA = $"visible-{i}" }).ToList();
+        for (var i = 0; i < chain.Count - 1; i++)
+            chain[i].Parents = [chain[i + 1].SHA];
+        var hidden = Enumerable.Range(0, chain.Count).Select(i => new Commit { SHA = $"merge-{i}" }).ToList();
+        for (var i = 0; i < hidden.Count; i++)
+            hidden[i].Parents = i + 1 < hidden.Count ? [hidden[i + 1].SHA, chain[i].SHA] : [chain[i].SHA];
+        var mergeTip = new Commit { SHA = "merge-tip", Parents = [hidden[0].SHA] };
+        var mergedHistory = new List<Commit> { mergeTip };
+        mergedHistory.AddRange(hidden);
+        mergedHistory.AddRange(chain);
+        var mergedVisible = new List<Commit> { mergeTip };
+        mergedVisible.AddRange(chain);
+        graph = CommitGraph.GenerateFiltered(mergedHistory, mergedVisible, false, CommitGraphHighlighting.All, []);
+        Check(graph.Paths.Count == 1 && graph.Dots.All(dot => dot.Center.X == 10), "hidden merges do not connect redundantly to every visible ancestor");
+        Check(chain[0].Parents.Single() == chain[1].SHA && hidden[0].Parents.Count == 2, "removing redundant graph edges preserves real commit parents");
+
+        var sparse = Enumerable.Range(0, 600).Select(i => new Commit { SHA = $"commit-{i}", Parents = [$"commit-{i + 1}"] }).ToList();
+        var visible = sparse.Where((_, i) => i % 3 == 0).ToList();
+        graph = CommitGraph.GenerateFiltered(sparse, visible, false, CommitGraphHighlighting.All, []);
+        Check(graph.Paths.Count == 1 && graph.Dots.All(dot => dot.Center.X == 10), "hundreds of sparse matches do not accumulate phantom branches");
+        graph = CommitGraph.Generate(sparse, false, CommitGraphHighlighting.All, []);
+        Check(graph.Dots.Count == sparse.Count && graph.Dots.All(dot => dot.Center.X == 10), "unfiltered graph retains original topology");
+    }
+
+    private static HashSet<string> Search(string repo, List<Commit> commits, string filter) =>
+        new QueryHistoryQuickSearch(repo, commits, filter, CancellationToken.None).GetResultAsync().GetAwaiter().GetResult();
+
+    private static bool IsRowVisible(DataGrid grid, Commit commit)
+    {
+        var presenter = grid.GetVisualDescendants().OfType<Avalonia.Controls.Primitives.DataGridRowsPresenter>().First();
+        return presenter.GetVisualDescendants().OfType<DataGridRow>().Any(row =>
+        {
+            var position = row.TranslatePoint(default, presenter);
+            return row.DataContext == commit && row.IsVisible && position.HasValue &&
+                position.Value.Y >= -0.5 && position.Value.Y + row.Bounds.Height <= presenter.Bounds.Height + 0.5;
+        });
+    }
+
+    private static void SetWindowActive(Window window, bool active)
+    {
+        // Simulate the platform activation callback without taking native desktop focus.
+        typeof(WindowBase).GetMethod(active ? "HandleActivated" : "HandleDeactivated",
+            BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)!.Invoke(window, null);
+    }
+
+    private static void WaitFor(Func<bool> condition)
+    {
+        var timer = Stopwatch.StartNew();
+        while (!condition())
+        {
+            if (timer.Elapsed > TimeSpan.FromSeconds(15))
+                throw new Exception("Timed out waiting for search");
+            Dispatcher.UIThread.RunJobs();
+            Thread.Sleep(10);
+        }
+        Dispatcher.UIThread.RunJobs();
+    }
+
+    private static void Check(bool condition, string label)
+    {
+        if (!condition)
+            throw new Exception(label);
+        _checks++;
+        Console.WriteLine("PASS " + label);
+    }
+
+    private static string Git(string cwd, params string[] args)
+    {
+        var start = new ProcessStartInfo("git") { WorkingDirectory = cwd, RedirectStandardOutput = true, RedirectStandardError = true };
+        foreach (var arg in args)
+            start.ArgumentList.Add(arg);
+        using var process = Process.Start(start)!;
+        var output = process.StandardOutput.ReadToEnd();
+        var error = process.StandardError.ReadToEnd();
+        process.WaitForExit();
+        if (process.ExitCode != 0)
+            throw new Exception(error);
+        return output;
+    }
+}
diff --git a/tests/HistoryQuickSearchChecks/README.md b/tests/HistoryQuickSearchChecks/README.md
new file mode 100644
index 000000000..49716231a
--- /dev/null
+++ b/tests/HistoryQuickSearchChecks/README.md
@@ -0,0 +1,35 @@
+# History quick search checks
+
+Run from the repository root:
+
+```sh
+dotnet run --project tests/HistoryQuickSearchChecks
+```
+
+These checks use a temporary Git repository and Avalonia Headless. They cover
+literal, case-insensitive Mixed matching (SHA prefix, author name/email, full
+commit message), loaded-history scope, cancellation, streamed messages, navigation,
+filter restoration, history refresh, selection preservation, keyboard input,
+Ctrl+F focus and F3 match navigation, inactive-window caret/focus appearance,
+and the active filter background. Tests leave user preferences untouched.
+
+An optional PNG path saves light and dark theme previews:
+
+```sh
+dotnet run --project tests/HistoryQuickSearchChecks -- /absolute/path/preview.png
+```
+
+Quick search is limited to commits already loaded in the history view, honoring
+its branch/date/commit-count constraints. It has no dependency on the separate
+`mixed-commit-search` branch or changes to the Commit Search panel.
+
+To reproduce filtered graph issues against a real repository without changing
+its files or preferences, run:
+
+```sh
+dotnet run --project tests/HistoryQuickSearchChecks -- --repository /path/to/repo /absolute/path/preview.png
+```
+
+This searches the loaded branch/tag history for `fix:`, checks graph width,
+and optionally saves previews at the first and last match. The fixture suite
+also covers hidden merges that expose redundant edges to visible ancestors.