diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 547d9e51..ef8ffd06 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -455,8 +455,10 @@
   <x:String x:Key="Text.Repository.Resolve" xml:space="preserve">RESOLVE</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
   <x:String x:Key="Text.Repository.Search.By" xml:space="preserve">Search By</x:String>
-  <x:String x:Key="Text.Repository.Search.ByBaseInfo" xml:space="preserve">Information</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">File</x:String>
+  <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
+  <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Author &amp; Committer</x:String>
   <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">Search Branches &amp; Tags</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistics</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULES</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c9f525b3..20265dab 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -457,8 +457,10 @@
   <x:String x:Key="Text.Repository.Resolve" xml:space="preserve">解决冲突</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">查找提交</x:String>
   <x:String x:Key="Text.Repository.Search.By" xml:space="preserve">搜索途径</x:String>
-  <x:String x:Key="Text.Repository.Search.ByBaseInfo" xml:space="preserve">摘要</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">文件</x:String>
+  <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交信息</x:String>
+  <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交指纹</x:String>
+  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
   <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">快速查找分支、标签</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">提交统计</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">子模块列表</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 38c4af51..70b7bbf1 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -457,8 +457,10 @@
   <x:String x:Key="Text.Repository.Resolve" xml:space="preserve">解決衝突</x:String>
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">查詢提交</x:String>
   <x:String x:Key="Text.Repository.Search.By" xml:space="preserve">查詢方式</x:String>
-  <x:String x:Key="Text.Repository.Search.ByBaseInfo" xml:space="preserve">摘要</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">檔案</x:String>
+  <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交資訊</x:String>
+  <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交指紋</x:String>
+  <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
   <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">快速查找分支、標籤</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">提交統計</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">子模組列表</x:String>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 4f0ecfa1..b42d9681 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -545,24 +545,33 @@ namespace SourceGit.ViewModels
             {
                 var visible = new List<Models.Commit>();
 
-                if (_searchCommitFilterType == 0)
+                switch (_searchCommitFilterType)
                 {
-                    foreach (var c in _histories.Commits)
-                    {
-                        if (c.SHA.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
-                            || c.Subject.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
-                            || c.Author.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))
+                    case 0:
+                        foreach (var c in _histories.Commits)
                         {
-                            visible.Add(c);
+                            if (c.SHA.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase))
+                                visible.Add(c);
                         }
-                    }
-                }
-                else
-                {
-                    visible = new Commands.QueryCommits(FullPath, $"-1000 -- \"{_searchCommitFilter}\"", false).Result();
+
+                        break;
+                    case 1:
+                        foreach (var c in _histories.Commits)
+                        {
+                            if (c.Author.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);
+                        }
+
+                        break;
+                    case 2:
+                        visible = new Commands.QueryCommits(FullPath, $"-1000 --grep=\"{_searchCommitFilter}\"", false).Result();
+                        break;
+                    case 3:
+                        visible = new Commands.QueryCommits(FullPath, $"-1000 -- \"{_searchCommitFilter}\"", false).Result();
+                        break;
                 }
 
                 Dispatcher.UIThread.Invoke(() =>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index d5914163..8b4ceeb6 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -580,7 +580,9 @@
                       HorizontalAlignment="Right"
                       SelectedIndex="{Binding SearchCommitFilterType, Mode=TwoWay}">
               <ComboBox.Items>
-                <TextBlock Text="{DynamicResource Text.Repository.Search.ByBaseInfo}" FontSize="12"/>
+                <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}" FontSize="12"/>
+                <TextBlock Text="{DynamicResource Text.Repository.Search.ByUser}" FontSize="12"/>
+                <TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}" FontSize="12"/>
                 <TextBlock Text="{DynamicResource Text.Repository.Search.ByFile}" FontSize="12"/>
               </ComboBox.Items>
             </ComboBox>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 3a05d517..409ceeda 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -73,7 +73,7 @@ namespace SourceGit.Views
         {
             if (e.Key == Key.Enter)
             {
-                if (DataContext is ViewModels.Repository repo)
+                if (DataContext is ViewModels.Repository repo && !string.IsNullOrWhiteSpace(repo.SearchCommitFilter))
                     repo.StartSearchCommits();
 
                 e.Handled = true;