diff --git a/frontend/viewer/src/lib/components/field-editors/multi-select.svelte b/frontend/viewer/src/lib/components/field-editors/multi-select.svelte
index 57d4904fa2..15b08dd6f2 100644
--- a/frontend/viewer/src/lib/components/field-editors/multi-select.svelte
+++ b/frontend/viewer/src/lib/components/field-editors/multi-select.svelte
@@ -163,13 +163,13 @@
 </script>
 
 {#snippet displayBadges()}
-  <div class="flex flex-wrap justify-start gap-2">
+  <div class="flex flex-wrap justify-start gap-2 overflow-hidden">
     {#each displayValues as value (getId(value))}
       <Badge>
-        {getLabel(value)}
+        {getLabel(value) || $t`Untitled`}
       </Badge>
     {:else}
-      <span class="text-muted-foreground">
+      <span class="text-muted-foreground x-ellipsis">
         {placeholder ?? $t`None`}
         <!-- ensures that:
           1) baseline alignment works for consumers of this component
@@ -213,7 +213,7 @@
         {/if}
       </div>
     </CommandInput>
-    <CommandList class="max-md:h-[300px] md:max-h-[50vh]">
+    <CommandList class="max-md:h-[300px] md:max-h-[40vh]">
       <CommandEmpty>{emptyResultsPlaceholder ?? $t`No items found`}</CommandEmpty>
       <CommandGroup>
         {#each renderedOptions as value, i (getId(value))}
@@ -222,9 +222,9 @@
           {@const selected = pendingValues.some(v => v.id === id)}
           <CommandItem
             keywords={[label.toLocaleLowerCase()]}
-            value={label.toLocaleLowerCase()}
+            value={label.toLocaleLowerCase() + String(id)}
             onSelect={() => toggleSelected(value, !dirty && !IsMobile.value)}
-            class="group max-md:h-12"
+            class={cn('group max-md:h-12', label || 'text-muted-foreground')}
             data-value-index={i}
             aria-label={label}
           >
@@ -245,7 +245,7 @@
               }}
               onCheckedChange={() => toggleSelected(value, false)}
             />
-            {label}
+            {label || $t`Untitled`}
           </CommandItem>
         {/each}
         {#if renderedOptions.length < filteredOptions.length}
diff --git a/frontend/viewer/src/lib/components/field-editors/select.svelte b/frontend/viewer/src/lib/components/field-editors/select.svelte
index 174a15abf3..65be500b7b 100644
--- a/frontend/viewer/src/lib/components/field-editors/select.svelte
+++ b/frontend/viewer/src/lib/components/field-editors/select.svelte
@@ -94,11 +94,11 @@
     <Button disabled={readonly} bind:ref={triggerRef} variant="outline" {...props} role="combobox" aria-expanded={open}
     class={cn('w-full h-auto min-h-10 px-2 justify-between disabled:opacity-100 disabled:border-transparent', className)}>
     {#if value}
-      <span>
-        {getLabel(value)}
+      <span class="x-ellipsis mr-4">
+        {getLabel(value) || $t`Untitled`}
       </span>
     {:else}
-      <span class="text-muted-foreground">
+      <span class="text-muted-foreground x-ellipsis mr-4">
         {placeholder ?? $t`None`}
         <!-- ensures that baseline alignment works for consumers of this component -->
         &nbsp;
@@ -129,7 +129,7 @@
         {/if}
       </div>
     </CommandInput>
-    <CommandList class="max-md:h-[300px] md:max-h-[50vh]">
+    <CommandList class="max-md:h-[300px] md:max-h-[40vh]">
       <CommandEmpty>{emptyResultsPlaceholder ?? $t`No items found`}</CommandEmpty>
       <CommandGroup>
         {#each renderedOptions as option, i (getId(option))}
@@ -138,14 +138,14 @@
           {@const selected = value && getId(value) === id}
           <CommandItem
             keywords={[label.toLocaleLowerCase()]}
-            value={label.toLocaleLowerCase()}
+            value={label.toLocaleLowerCase() + String(id)}
             onSelect={() => selectValue(option)}
-            class="group max-md:h-12"
+            class={cn('group max-md:h-12', label || 'text-muted-foreground')}
             data-value-index={i}
             aria-label={label}
           >
             <Icon icon="i-mdi-check" class={cn('md:hidden', selected || 'invisible')} />
-            {label}
+            {label || $t`Untitled`}
           </CommandItem>
         {/each}
         {#if renderedOptions.length < filteredOptions.length}
diff --git a/frontend/viewer/src/lib/components/ui/button/x-button.svelte b/frontend/viewer/src/lib/components/ui/button/x-button.svelte
index 993437505a..7af0b9b036 100644
--- a/frontend/viewer/src/lib/components/ui/button/x-button.svelte
+++ b/frontend/viewer/src/lib/components/ui/button/x-button.svelte
@@ -12,5 +12,5 @@
 </script>
 
 <Button icon="i-mdi-close" variant="ghost" size="xs-icon" aria-label={$t`Close`}
-  class={cn('opacity-70 transition-opacity hover:opacity-100 ring-offset-background focus:ring-ring focus:outline-none focus:ring-2 disabled:pointer-events-none',
+  class={cn('bg-background opacity-70 transition-opacity hover:opacity-100 ring-offset-background focus:ring-ring focus:outline-none focus:ring-2 disabled:pointer-events-none',
   className)} {...restProps} />
diff --git a/frontend/viewer/src/locales/en.po b/frontend/viewer/src/locales/en.po
index a49221f1a7..eba99b5467 100644
--- a/frontend/viewer/src/locales/en.po
+++ b/frontend/viewer/src/locales/en.po
@@ -130,6 +130,14 @@ msgstr "Add Word"
 msgid "an entry"
 msgstr "an entry"
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr "Any grammatical info."
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr "Any part of speech"
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr "Any semantic domain"
@@ -576,6 +584,7 @@ msgstr "Gloss"
 msgid "Go to {0}"
 msgstr "Go to {0}"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr "Grammatical info."
@@ -893,6 +902,7 @@ msgstr "Part"
 msgid "Part of"
 msgstr "Part of"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "Part of speech"
@@ -1243,6 +1253,10 @@ msgstr "Unknown server"
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr "Untitled"
 
diff --git a/frontend/viewer/src/locales/es.po b/frontend/viewer/src/locales/es.po
index cb882c0b56..850b5db075 100644
--- a/frontend/viewer/src/locales/es.po
+++ b/frontend/viewer/src/locales/es.po
@@ -135,6 +135,14 @@ msgstr ""
 msgid "an entry"
 msgstr "una entrada"
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr ""
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr ""
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr ""
@@ -581,6 +589,7 @@ msgstr "Glosa"
 msgid "Go to {0}"
 msgstr "Visite {0}"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr "Información gramatical."
@@ -898,6 +907,7 @@ msgstr "Pieza"
 msgid "Part of"
 msgstr "Parte de"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "Parte de la oración"
@@ -1248,6 +1258,10 @@ msgstr ""
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr "Sin título"
 
diff --git a/frontend/viewer/src/locales/fr.po b/frontend/viewer/src/locales/fr.po
index 0f7e31fafd..c0ff536c62 100644
--- a/frontend/viewer/src/locales/fr.po
+++ b/frontend/viewer/src/locales/fr.po
@@ -135,6 +135,14 @@ msgstr ""
 msgid "an entry"
 msgstr "une entrée"
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr ""
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr ""
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr ""
@@ -581,6 +589,7 @@ msgstr "Glose"
 msgid "Go to {0}"
 msgstr "Aller sur {0}"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr "Informations grammaticales."
@@ -898,6 +907,7 @@ msgstr "Partie"
 msgid "Part of"
 msgstr "Une partie de"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "Partie du discours"
@@ -1248,6 +1258,10 @@ msgstr ""
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr "Sans titre"
 
diff --git a/frontend/viewer/src/locales/id.po b/frontend/viewer/src/locales/id.po
index 730ac4484d..0da1aaf714 100644
--- a/frontend/viewer/src/locales/id.po
+++ b/frontend/viewer/src/locales/id.po
@@ -135,6 +135,14 @@ msgstr ""
 msgid "an entry"
 msgstr "sebuah entri"
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr ""
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr ""
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr ""
@@ -581,6 +589,7 @@ msgstr "Arti Singkat"
 msgid "Go to {0}"
 msgstr "Buka {0}"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr "Info tata bahasa."
@@ -898,6 +907,7 @@ msgstr "Bagian"
 msgid "Part of"
 msgstr "Bagian dari"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "Bagian dari pidato"
@@ -1248,6 +1258,10 @@ msgstr ""
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr "Tanpa judul"
 
diff --git a/frontend/viewer/src/locales/ko.po b/frontend/viewer/src/locales/ko.po
index e3a2c7d8d3..1c5372406f 100644
--- a/frontend/viewer/src/locales/ko.po
+++ b/frontend/viewer/src/locales/ko.po
@@ -135,6 +135,14 @@ msgstr ""
 msgid "an entry"
 msgstr "항목"
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr ""
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr ""
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr ""
@@ -581,6 +589,7 @@ msgstr "광택"
 msgid "Go to {0}"
 msgstr "{0}으로 이동"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr "문법 정보."
@@ -898,6 +907,7 @@ msgstr "Part"
 msgid "Part of"
 msgstr "의 일부"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "품사"
@@ -1248,6 +1258,10 @@ msgstr ""
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr "제목 없음"
 
diff --git a/frontend/viewer/src/locales/ms.po b/frontend/viewer/src/locales/ms.po
index deea99d1f9..3b8d58b63e 100644
--- a/frontend/viewer/src/locales/ms.po
+++ b/frontend/viewer/src/locales/ms.po
@@ -135,6 +135,14 @@ msgstr ""
 msgid "an entry"
 msgstr "satu entri"
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr ""
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr ""
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr ""
@@ -581,6 +589,7 @@ msgstr "Glos"
 msgid "Go to {0}"
 msgstr "Pergi ke {0}"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr "Maklumat tatabahasa."
@@ -898,6 +907,7 @@ msgstr "Bahagian"
 msgid "Part of"
 msgstr "Sebahagian daripada"
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "Jenis Perkataan"
@@ -1248,6 +1258,10 @@ msgstr ""
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr "Tanpa Tajuk"
 
diff --git a/frontend/viewer/src/locales/sw.po b/frontend/viewer/src/locales/sw.po
index 1da9d02015..2d60b1dbbf 100644
--- a/frontend/viewer/src/locales/sw.po
+++ b/frontend/viewer/src/locales/sw.po
@@ -135,6 +135,14 @@ msgstr ""
 msgid "an entry"
 msgstr ""
 
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any grammatical info."
+msgstr ""
+
+#: src/project/browse/filter/PartOfSpeechSelect.svelte
+msgid "Any part of speech"
+msgstr ""
+
 #: src/project/browse/filter/SemanticDomainSelect.svelte
 msgid "Any semantic domain"
 msgstr ""
@@ -581,6 +589,7 @@ msgstr "Glosi"
 msgid "Go to {0}"
 msgstr ""
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Grammatical info."
 msgstr ""
@@ -898,6 +907,7 @@ msgstr "Sehemu"
 msgid "Part of"
 msgstr ""
 
+#: src/project/browse/SearchFilter.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Part of speech"
 msgstr "Sehemu za mazungumzo"
@@ -1248,6 +1258,10 @@ msgstr ""
 #: src/project/browse/EntryView.svelte
 #: src/project/browse/EntryRow.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
+#: src/lib/components/field-editors/multi-select.svelte
 msgid "Untitled"
 msgstr ""
 
diff --git a/frontend/viewer/src/project/browse/SearchFilter.svelte b/frontend/viewer/src/project/browse/SearchFilter.svelte
index 9d81ee0900..187d4b8f3b 100644
--- a/frontend/viewer/src/project/browse/SearchFilter.svelte
+++ b/frontend/viewer/src/project/browse/SearchFilter.svelte
@@ -19,8 +19,9 @@
   import FieldSelect, {type SelectedField} from './filter/FieldSelect.svelte';
   import MissingSelect, {type MissingOption} from './filter/MissingSelect.svelte';
   import SemanticDomainSelect from './filter/SemanticDomainSelect.svelte';
+  import PartOfSpeechSelect from './filter/PartOfSpeechSelect.svelte';
   import Label from '$lib/components/ui/label/label.svelte';
-  import type {ISemanticDomain} from '$lib/dotnet-types';
+  import type {ISemanticDomain, IPartOfSpeech} from '$lib/dotnet-types';
   import {Switch} from '$lib/components/ui/switch';
 
   const stats = useProjectStats();
@@ -42,6 +43,7 @@
   let filterOp = $state<Op>('contains')
   let semanticDomain = $state<ISemanticDomain>();
   let includeSubDomains = $state(false);
+  let partOfSpeech = $state<IPartOfSpeech>();
 
   $effect(() => {
     let newFilter: string[] = [];
@@ -74,6 +76,10 @@
       newFilter.push(`Senses.SemanticDomains.Code${includeSubDomains ? '^' : '='}${semanticDomain.code}`);
     }
 
+    if (partOfSpeech) {
+      newFilter.push(`Senses.PartOfSpeechId=${partOfSpeech.id}`);
+    }
+
     gridifyFilter = newFilter.join(', ');
   });
 
@@ -115,7 +121,7 @@
       {/snippet}
     </ComposableInput>
   </div>
-  <Collapsible.Content class="p-2 mb-2 space-y-2">
+  <Collapsible.Content class="p-2 mb-2 space-y-2 max-h-[calc(65vh-3rem)] overflow-y-auto">
     <div class="flex flex-col">
       <Label class="p-2">{$t`Specific field`}</Label>
       <div class="flex flex-col @md/list:flex-row gap-2 items-stretch">
@@ -141,6 +147,10 @@
       <SemanticDomainSelect bind:value={semanticDomain} />
       <Switch class="mt-1.5" disabled={!semanticDomain} bind:checked={includeSubDomains} label={$t`Include subdomains`} />
     </div>
+    <div class="flex flex-col">
+      <Label class="p-2">{pt($t`Grammatical info.`, $t`Part of speech`, $currentView)}</Label>
+      <PartOfSpeechSelect bind:value={partOfSpeech} />
+    </div>
     <div class="flex flex-col">
       <Label class="p-2">{$t`Incomplete entries`}</Label>
       <MissingSelect bind:value={missingField} />
diff --git a/frontend/viewer/src/project/browse/filter/PartOfSpeechSelect.svelte b/frontend/viewer/src/project/browse/filter/PartOfSpeechSelect.svelte
new file mode 100644
index 0000000000..4eaa2cee20
--- /dev/null
+++ b/frontend/viewer/src/project/browse/filter/PartOfSpeechSelect.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+  import {useWritingSystemService} from '$lib/writing-system-service.svelte';
+  import {usePartsOfSpeech} from '$lib/parts-of-speech.svelte';
+  import type {IPartOfSpeech} from '$lib/dotnet-types';
+  import {Select} from '$lib/components/field-editors';
+  import { t } from 'svelte-i18n-lingui';
+  import {pt} from '$lib/views/view-text';
+  import {useCurrentView} from '$lib/views/view-service';
+
+  let {value = $bindable()}: { value?: IPartOfSpeech } = $props();
+
+  const partsOfSpeech = usePartsOfSpeech();
+  const writingSystemService = useWritingSystemService();
+  const currentView = useCurrentView();
+</script>
+
+<Select
+  bind:value
+  options={partsOfSpeech.current}
+  labelSelector={(pos) => writingSystemService.pickBestAlternative(pos.name, 'analysis')}
+  placeholder={pt($t`Any grammatical info.`, $t`Any part of speech`, $currentView)}
+  clearable
+  idSelector="id" />