diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 39a66b0ba..849312aea 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -160,6 +160,7 @@ import {
   doorOpen,
   download,
   envelope,
+  envelopeAt,
   exclamationCircleFill,
   exclamationTriangle,
   exclamationTriangleFill,
@@ -256,6 +257,7 @@ const icons = {
   doorOpen,
   download,
   envelope,
+  envelopeAt,
   exclamationCircleFill,
   exclamationTriangle,
   exclamationTriangleFill,
diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.html b/src-ui/src/app/components/app-frame/global-search/global-search.component.html
index 5c71dd8c5..451533fb2 100644
--- a/src-ui/src/app/components/app-frame/global-search/global-search.component.html
+++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.html
@@ -33,7 +33,7 @@
                 @if (type === DataType.Document) {
                     <i-bs width="1em" height="1em" name="pencil"></i-bs>
                     <span>&nbsp;<ng-container i18n>Open</ng-container></span>
-                } @else if (type === DataType.Workflow || type === DataType.CustomField || type === DataType.Group || type === DataType.User) {
+                } @else if (type === DataType.Workflow || type === DataType.CustomField || type === DataType.Group || type === DataType.User || type === DataType.MailAccount || type === DataType.MailRule) {
                     <i-bs width="1em" height="1em" name="pencil"></i-bs>
                     <span>&nbsp;<ng-container i18n>Edit</ng-container></span>
                 } @else {
@@ -41,7 +41,7 @@
                     <span>&nbsp;<ng-container i18n>Filter documents</ng-container></span>
                 }
             </button>
-            @if (type !== DataType.Workflow && type !== DataType.CustomField && type !== DataType.Group && type !== DataType.User) {
+            @if (type !== DataType.Workflow && type !== DataType.CustomField && type !== DataType.Group && type !== DataType.User && type !== DataType.MailAccount && type !== DataType.MailRule) {
                 <button #secondaryButton type="button" class="btn btn-sm btn-outline-primary d-flex"
                 (click)="secondaryAction(type, item); $event.stopPropagation()"
                 [disabled]="disableSecondaryButton(type, item)"
@@ -119,6 +119,20 @@
                 }
             }
 
+            @if (searchResults?.mail_accounts.length) {
+                <h6 class="dropdown-header" i18n="@@searchResults.mailAccounts">Mail accounts</h6>
+                @for (mailAccount of searchResults.mail_accounts; track mailAccount.id) {
+                    <ng-container *ngTemplateOutlet="resultItemTemplate; context: {item: mailAccount, nameProp: 'name', type: DataType.MailAccount, icon: 'envelope-at'}"></ng-container>
+                }
+            }
+
+            @if (searchResults?.mail_rules.length) {
+                <h6 class="dropdown-header" i18n="@@searchResults.mailRules">Mail rules</h6>
+                @for (mailRule of searchResults.mail_rules; track mailRule.id) {
+                    <ng-container *ngTemplateOutlet="resultItemTemplate; context: {item: mailRule, nameProp: 'name', type: DataType.MailRule, icon: 'envelope'}"></ng-container>
+                }
+            }
+
             @if (searchResults?.workflows.length) {
                 <h6 class="dropdown-header" i18n="@@searchResults.workflows">Workflows</h6>
                 @for (workflow of searchResults.workflows; track workflow.id) {
diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
index d269dcc9d..eaf5aae87 100644
--- a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
+++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
@@ -66,7 +66,7 @@ const searchResults = {
   storage_paths: [
     {
       id: 1,
-      path: 'TestStoragePath',
+      name: 'TestStoragePath',
     },
   ],
   tags: [
@@ -208,6 +208,17 @@ describe('GlobalSearchComponent', () => {
     )
     expect(component['currentItemIndex']).toBe(-1)
     expect(inputFocusSpy).toHaveBeenCalled()
+
+    component.handleKeyboardEvent(
+      new KeyboardEvent('keydown', { key: 'ArrowDown' })
+    )
+    component['currentItemIndex'] = searchResults.total - 1
+    component['setCurrentItem']()
+    component.handleKeyboardEvent(
+      new KeyboardEvent('keydown', { key: 'ArrowDown' })
+    )
+    expect(component['currentItemIndex']).toBe(0)
+    expect(zeroItemSpy).toHaveBeenCalled()
   })
 
   it('should search on query debounce', fakeAsync(() => {
diff --git a/src/documents/views.py b/src/documents/views.py
index c46807893..657fc1d37 100644
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -1130,7 +1130,7 @@ class GlobalSearchView(PassUserMixin):
 
         tags = (
             get_objects_for_user_owner_aware(request.user, "view_tag", Tag).filter(
-                name__contains=query,
+                name__icontains=query,
             )[:3]
             if request.user.has_perm("documents.view_tag")
             else []
@@ -1140,7 +1140,7 @@ class GlobalSearchView(PassUserMixin):
                 request.user,
                 "view_correspondent",
                 Correspondent,
-            ).filter(name__contains=query)[:3]
+            ).filter(name__icontains=query)[:3]
             if request.user.has_perm("documents.view_correspondent")
             else []
         )
@@ -1149,7 +1149,7 @@ class GlobalSearchView(PassUserMixin):
                 request.user,
                 "view_documenttype",
                 DocumentType,
-            ).filter(name__contains=query)[:3]
+            ).filter(name__icontains=query)[:3]
             if request.user.has_perm("documents.view_documenttype")
             else []
         )
@@ -1158,37 +1158,37 @@ class GlobalSearchView(PassUserMixin):
                 request.user,
                 "view_storagepath",
                 StoragePath,
-            ).filter(name__contains=query)[:3]
+            ).filter(name__icontains=query)[:3]
             if request.user.has_perm("documents.view_storagepath")
             else []
         )
         users = (
-            User.objects.filter(username__contains=query)[:3]
+            User.objects.filter(username__icontains=query)[:3]
             if request.user.has_perm("documents.view_user")
             else []
         )
         groups = (
-            Group.objects.filter(name__contains=query)[:3]
+            Group.objects.filter(name__icontains=query)[:3]
             if request.user.has_perm("documents.view_group")
             else []
         )
         mail_rules = (
-            MailRule.objects.filter(name__contains=query)[:3]
-            if request.user.has_perm("documents.view_mailrule")
+            MailRule.objects.filter(name__icontains=query)[:3]
+            if request.user.has_perm("paperless_mail.view_mailrule")
             else []
         )
         mail_accounts = (
-            MailAccount.objects.filter(name__contains=query)[:3]
-            if request.user.has_perm("documents.view_mailaccount")
+            MailAccount.objects.filter(name__icontains=query)[:3]
+            if request.user.has_perm("paperless_mail.view_mailaccount")
             else []
         )
         workflows = (
-            Workflow.objects.filter(name__contains=query)[:3]
+            Workflow.objects.filter(name__icontains=query)[:3]
             if request.user.has_perm("documents.view_workflow")
             else []
         )
         custom_fields = (
-            CustomField.objects.filter(name__contains=query)[:3]
+            CustomField.objects.filter(name__icontains=query)[:3]
             if request.user.has_perm("documents.view_customfield")
             else []
         )