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 44ca82b61da..f46327fd62c 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
@@ -4,7 +4,9 @@
     (keyup.space)="isActive ? deactivateSection($event) : activateSection($event)"
     (keydown.space)="$event.preventDefault()"
     (mouseenter)="activateSection($event)"
-    (mouseleave)="deactivateSection($event)">
+    (mouseleave)="deactivateSection($event)"
+    aria-haspopup="menu"
+    aria-expanded="false">
     <button class="btn btn-link nav-link dropdown-toggle" routerLinkActive="active" type="button"
        [class.disabled]="section.model?.disabled"
        (click)="toggleSection($event)"
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 d32fa46a327..0bbbeb8474a 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
@@ -39,11 +39,17 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    * @param {Event} event The user event that triggered this function
    */
   activateSection(event): void {
+
+    console.log(event.target);
+    
+
     this.windowService.isXsOrSm().pipe(
       first()
     ).subscribe((isMobile) => {
       if (!isMobile) {
+        const targetElement = event.target as HTMLElement;
         super.activateSection(event);
+        targetElement.setAttribute('aria-expanded', 'true'); 
       }
     });
   }
@@ -58,7 +64,9 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
       first()
     ).subscribe((isMobile) => {
       if (!isMobile) {
+        const targetElement = event.target as HTMLElement;
         super.deactivateSection(event);
+        targetElement.setAttribute('aria-expanded', 'false'); 
       }
     });
   }