diff --git a/src/app/components/create-menu/create-menu.component.html b/src/app/components/create-menu/create-menu.component.html
index 26515c61e..3207c7eb1 100644
--- a/src/app/components/create-menu/create-menu.component.html
+++ b/src/app/components/create-menu/create-menu.component.html
@@ -37,7 +37,7 @@
   [overlapTrigger]="false"
   yPosition="below"
 >
-  <ng-container *ngFor="let action of createActions; trackBy: trackById">
+  <div role="menu" *ngFor="let action of createActions; trackBy: trackById">
     <app-toolbar-menu-item [actionRef]="action"></app-toolbar-menu-item>
-  </ng-container>
+  </div>
 </mat-menu>
diff --git a/src/app/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.html b/src/app/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.html
index 9ffd5e6fd..b0cf531c0 100644
--- a/src/app/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.html
+++ b/src/app/components/toolbar/toolbar-menu-item/toolbar-menu-item.component.html
@@ -2,6 +2,7 @@
   <ng-container *ngSwitchCase="'menu'">
     <button
       mat-menu-item
+      role="menuitem"
       [disabled]="actionRef.disabled"
       [matMenuTriggerFor]="childMenu"
     >
@@ -29,6 +30,7 @@
   <ng-container *ngSwitchDefault>
     <button
       [id]="actionRef.id"
+      role="button"
       mat-menu-item
       [role]="'button'"
       color="primary"