diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
index 96126817a..c136c70b4 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
@@ -154,7 +154,10 @@ export class SearchInputComponent implements OnInit, OnDestroy {
     } else {
       this.store.dispatch(new SnackbarErrorAction('APP.BROWSE.SEARCH.EMPTY_SEARCH'));
     }
-    this.trigger.closeMenu();
+
+    if (this.trigger) {
+      this.trigger.closeMenu();
+    }
   }
 
   onSearchChange(searchTerm: string) {
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
index 02f3e8b61..9cc85a86f 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html
@@ -1,7 +1,8 @@
 <aca-page-layout>
   <aca-page-layout-header>
     <aca-search-input></aca-search-input>
-    <adf-toolbar class="adf-toolbar--inline adf-toolbar-search-results">
+    <div class="adf-toolbar--spacer adf-toolbar-divider"></div>
+    <adf-toolbar class="adf-toolbar--inline">
       <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
         <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
       </ng-container>
diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
index f152179e1..e10f63ead 100644
--- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
+++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.scss
@@ -3,13 +3,6 @@
 $adf-chip-background: #efefef;
 $contrast-gray: #646569;
 
-.adf-toolbar-search-results {
-  position: fixed;
-  right: 24px;
-  height: 32px;
-  margin-bottom: 32px !important;
-}
-
 .adf-search-results {
   @include flex-row;