diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 70d6b2b5b2a..00517a74cf0 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -9,6 +9,7 @@
(keyup.space)="toggleSection($event)"
(click)="toggleSection($event)"
(keydown.space)="$event.preventDefault()"
+ (keydown.tab)="deactivateSection($event, false)"
aria-haspopup="menu"
data-test="navbar-section-toggler"
[attr.aria-expanded]="(active$ | async).valueOf()"
@@ -22,7 +23,7 @@
-
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 7f4405e2b60..9526b0e5d7f 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -15,7 +15,6 @@ import { RouterLinkActive } from '@angular/router';
import { Observable } from 'rxjs';
import { first } from 'rxjs/operators';
-import { slide } from '../../shared/animations/slide';
import { HostWindowService } from '../../shared/host-window.service';
import { MenuService } from '../../shared/menu/menu.service';
import { MenuID } from '../../shared/menu/menu-id.model';
@@ -29,7 +28,6 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
selector: 'ds-base-expandable-navbar-section',
templateUrl: './expandable-navbar-section.component.html',
styleUrls: ['./expandable-navbar-section.component.scss'],
- animations: [slide],
standalone: true,
imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
})
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index 685ebe6b991..43df73547a5 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -102,10 +102,14 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
/**
* Deactivate this section
+ *
* @param {Event} event The user event that triggered this method
+ * @param skipEvent Weather the event should still be triggered after deactivating the section or not
*/
- deactivateSection(event: Event) {
- event.preventDefault();
+ deactivateSection(event: Event, skipEvent = true): void {
+ if (skipEvent) {
+ event.preventDefault();
+ }
this.menuService.deactivateSection(this.menuID, this.section.id);
}