diff --git a/lib/core/src/lib/notifications/components/notification-history.component.html b/lib/core/src/lib/notifications/components/notification-history.component.html
index b71aa1265aa..e17a9d2b5a9 100644
--- a/lib/core/src/lib/notifications/components/notification-history.component.html
+++ b/lib/core/src/lib/notifications/components/notification-history.component.html
@@ -1,6 +1,7 @@
 <div (keyup)="onKeyPress($event)" tabindex="-1" role="button" class="adf-notification-history-container">
     <button mat-button
             [matMenuTriggerFor]="menu"
+            aria-hidden="false"
             [attr.aria-label]="'NOTIFICATIONS.OPEN_HISTORY' | translate"
             title="{{ 'NOTIFICATIONS.OPEN_HISTORY' | translate }}"
             class="adf-notification-history-menu_button"
diff --git a/lib/core/src/lib/search-text/search-text-input.component.ts b/lib/core/src/lib/search-text/search-text-input.component.ts
index 23bea28a1b1..25316f9faa1 100644
--- a/lib/core/src/lib/search-text/search-text-input.component.ts
+++ b/lib/core/src/lib/search-text/search-text-input.component.ts
@@ -166,9 +166,12 @@ export class SearchTextInputComponent implements OnInit, OnDestroy {
     private toggleSearch = new Subject<any>();
     private focusSubscription: Subscription;
     private valueChange = new Subject<string>();
+    private toggleSubscription: Subscription;
+
+    toggle$ = this.toggleSearch.asObservable();
 
     constructor(private userPreferencesService: UserPreferencesService) {
-        this.toggleSearch.pipe(debounceTime(200), takeUntil(this.onDestroy$)).subscribe(() => {
+        this.toggleSubscription = this.toggle$.pipe(debounceTime(200), takeUntil(this.onDestroy$)).subscribe(() => {
             if (this.expandable) {
                 this.subscriptAnimationState = this.toggleAnimation();
                 if (this.subscriptAnimationState.value === 'inactive') {
@@ -302,6 +305,7 @@ export class SearchTextInputComponent implements OnInit, OnDestroy {
 
     ngOnDestroy() {
         if (this.toggleSearch) {
+            this.toggleSubscription.unsubscribe();
             this.toggleSearch.complete();
             this.toggleSearch = null;
         }