diff --git a/client/src/app/shared/components/os-sort-filter-bar/os-sort-filter-bar.component.html b/client/src/app/shared/components/os-sort-filter-bar/os-sort-filter-bar.component.html
index beea3aacc..dfbcbb56a 100644
--- a/client/src/app/shared/components/os-sort-filter-bar/os-sort-filter-bar.component.html
+++ b/client/src/app/shared/components/os-sort-filter-bar/os-sort-filter-bar.component.html
@@ -35,6 +35,7 @@
         </button>
         <mat-form-field *ngIf="isSearchBar">
             <input
+                osAutofocus
                 matInput
                 (keyup)="applySearch($event, $event.target.value)"
                 placeholder="{{ translate.instant('Search') }}"
diff --git a/client/src/app/site/common/components/search/search.component.html b/client/src/app/site/common/components/search/search.component.html
index 3f5c936e6..edb463a28 100644
--- a/client/src/app/site/common/components/search/search.component.html
+++ b/client/src/app/site/common/components/search/search.component.html
@@ -11,7 +11,7 @@
 <div class="search-field">
     <form [formGroup]="quickSearchform">
         <mat-form-field>
-            <input matInput formControlName="query" (keyup)="quickSearch()" />
+            <input matInput osAutofocus formControlName="query" (keyup)="quickSearch()" />
             <mat-icon matSuffix>search</mat-icon>
         </mat-form-field>
     </form>