diff --git a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts
index 6bedf3d112..bb6e6177ac 100644
--- a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts
+++ b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts
@@ -216,7 +216,6 @@ export abstract class BaseSearchSelectorComponent extends BaseFormFieldControlCo
         }
         this._selectableItemsList = this.sortFn ? allItems.sort(this.sortFn) : allItems;
         this.filteredItemsSubject.next(this.getFilteredItemsBySearchValue());
-        this.updateOptionFocus();
     }
 
     protected get selectableItems(): Selectable[] {
@@ -258,15 +257,6 @@ export abstract class BaseSearchSelectorComponent extends BaseFormFieldControlCo
         document.body.appendChild(sheet);
     }
 
-    private updateOptionFocus(): void {
-        setTimeout(() => {
-            if (!this.matSelect?.options.some(o => o.active)) {
-                this.matSelect.options.first.focus();
-                this.matSelect.options.first.setActiveStyles();
-            }
-        }, 200);
-    }
-
     public onChipRemove(itemId: Id): void {
         this.addOrRemoveId(itemId);
 
@@ -348,7 +338,6 @@ export abstract class BaseSearchSelectorComponent extends BaseFormFieldControlCo
 
     protected onSearchValueUpdated(nextValue: string): void {
         this.filteredItemsSubject.next(this.getFilteredItemsBySearchValue(nextValue.toLowerCase()));
-        this.updateOptionFocus();
     }
 
     protected initializeForm(): void {