diff --git a/src/components/management/SearchBox/index.jsx b/src/components/management/SearchBox/index.jsx
index 01d47f7..716a0d9 100644
--- a/src/components/management/SearchBox/index.jsx
+++ b/src/components/management/SearchBox/index.jsx
@@ -23,7 +23,7 @@ export class SearchBox extends Component {
       searchTerm: '',
       caseSensitive: false,
       ignoreDiacritics: false,
-      filteredPartsOfSpeech: [...props.partsOfSpeech, 'Uncategorized'],
+      filteredPartsOfSpeech: this.partsOfSpeechForFilter,
       showHeader: false,
       showAdvanced: false,
     };
@@ -62,7 +62,7 @@ export class SearchBox extends Component {
   }
 
   togglePartOfSpeech (event) {
-    const uniquePartsOfSpeech = new Set(this.partsOfSpeechForFilter);
+    const uniquePartsOfSpeech = new Set(this.state.filteredPartsOfSpeech);
     if (event.target.checked) {
       uniquePartsOfSpeech.add(event.target.value);
     } else {
@@ -314,6 +314,8 @@ export class SearchBox extends Component {
   showHeader () {
     this.setState({
       showHeader: true,
+    }, () => {
+      this.searchBox.focus();
     });
   }