diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index c19d0a25..85b5131e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -292,7 +292,9 @@ namespace SourceGit.ViewModels {
                     || c.Subject.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
                     || c.Message.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
                     || c.Author.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
-                    || c.Committer.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)) {
+                    || c.Committer.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
+                    || c.Author.Email.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
+                    || c.Committer.Email.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)) {
                     visible.Add(c);
                 }
             }
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index a39890c9..e5739189 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -346,10 +346,11 @@
       </Grid>
 
       <!-- Left Search Mode -->
-      <Grid Grid.Column="0" RowDefinitions="32,*" IsVisible="{Binding IsSearching}">
+      <Grid Grid.Column="0" RowDefinitions="32,*" IsVisible="{Binding IsSearching}" PropertyChanged="OnSearchCommitPanelPropertyChanged">
         <!-- Search -->
         <Grid Grid.Row="0" Margin="4,2">
           <TextBox Grid.Column="1"
+                   x:Name="txtSearchCommitsBox"
                    Padding="22,0"
                    FontSize="12"
                    Height="24"
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 08ff6a94..c1effb46 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -88,6 +88,13 @@ namespace SourceGit.Views {
             }
         }
 
+        private void OnSearchCommitPanelPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e) {
+            var grid = sender as Grid;
+            if (e.Property == IsVisibleProperty && grid.IsVisible) {
+                txtSearchCommitsBox.Focus();
+            }
+        }
+
         private void OnSearchKeyDown(object sender, KeyEventArgs e) {
             if (e.Key == Key.Enter) {
                 if (DataContext is ViewModels.Repository repo) {