diff --git a/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts b/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
index 15dbc16dba89638e639c4050e703db046ab1f3fb..1b2dbf564b7ca8aea32965346c9d9c5fe148968e 100644
--- a/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
+++ b/src/app/structure-list/components/structure-list-search/structure-list-search.component.ts
@@ -202,7 +202,7 @@ export class StructureListSearchComponent implements OnInit {
   private setFocusOnOpenedModal(): void {
     setTimeout(() => {
       const modalFirstFocusableElement = this.elementRef.nativeElement.querySelector(
-        `.modalContent input, .modalContent button`,
+        `.modalContent .collapse-header, .modalContent input`,
       );
       if (modalFirstFocusableElement) {
         const focusedElement = modalFirstFocusableElement as HTMLElement;