diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html
index bda8b6428..b122df9f0 100644
--- a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html
+++ b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.html
@@ -12,9 +12,10 @@
 </button>
 
 <mat-menu #menu="matMenu" [overlapTrigger]="false">
-  <ng-container *ngFor="let child of actionRef.children; trackBy: trackByActionId" [ngSwitch]="child.type">
+  <ng-container *ngFor="let child of actionRef.children; trackBy: trackByActionId">
+    <ng-container [ngSwitch]="child.type">
       <ng-container *ngSwitchCase="'custom'">
-        <button mat-menu-item style="padding: 0" (click)="onCustomItemContainerClick($event)">
+        <button mat-menu-item class="aca-mat-menu-item-container" (click)="onCustomItemContainerClick($event)">
           <adf-dynamic-component [id]="child.component" [data]="child.data"></adf-dynamic-component>
         </button>
       </ng-container>
@@ -22,9 +23,10 @@
         <app-toolbar-menu-item [actionRef]="child" [menuId]="actionRef.id"></app-toolbar-menu-item>
       </ng-container>
       <ng-container *ngSwitchDefault>
-        <button mat-menu-item style="padding: 0" (click)="onCustomItemContainerClick($event)">
+        <button mat-menu-item class="aca-mat-menu-item-container" (click)="onCustomItemContainerClick($event)">
           <app-toolbar-menu-item [actionRef]="child" [menuId]="actionRef.id"></app-toolbar-menu-item>
         </button>
       </ng-container>
+    </ng-container>
   </ng-container>
 </mat-menu>
diff --git a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts
index a105f7f5e..1f0ea4bd1 100644
--- a/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts
+++ b/projects/aca-shared/src/lib/components/tool-bar/toolbar-menu/toolbar-menu.component.ts
@@ -23,17 +23,23 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Component, Input, ViewEncapsulation, HostListener, ViewChild, ViewChildren, QueryList } from '@angular/core';
+import { Component, Input, ViewEncapsulation, HostListener, ViewChild } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
 import { MatMenu, MatMenuTrigger } from '@angular/material/menu';
 import { ThemePalette } from '@angular/material/core';
-import { ToolbarMenuItemComponent } from '../toolbar-menu-item/toolbar-menu-item.component';
 
 @Component({
   selector: 'app-toolbar-menu',
   templateUrl: './toolbar-menu.component.html',
   encapsulation: ViewEncapsulation.None,
-  host: { class: 'app-toolbar-menu' }
+  host: { class: 'app-toolbar-menu' },
+  styles: [
+    `
+      .aca-mat-menu-item-container {
+        padding: 0;
+      }
+    `
+  ]
 })
 export class ToolbarMenuComponent {
   @Input()
@@ -48,9 +54,6 @@ export class ToolbarMenuComponent {
   @ViewChild(MatMenu)
   menu: MatMenu;
 
-  @ViewChildren(ToolbarMenuItemComponent)
-  toolbarMenuItems: QueryList<ToolbarMenuItemComponent>;
-
   @HostListener('document:keydown.Escape')
   handleKeydownEscape() {
     this.matTrigger.closeMenu();
@@ -61,19 +64,8 @@ export class ToolbarMenuComponent {
   }
 
   onCustomItemContainerClick(event) {
-    console.log(event);
-    const el: HTMLElement = event.target;
-    const x = window.scrollX + el.getBoundingClientRect().left + 5;
-    const y = window.scrollY + el.getBoundingClientRect().top + 5;
-
-    const opts = {
-      bubbles: false,
-      screenX: x,
-      screenY: y
-    };
-
-    const ev = new MouseEvent('click', opts);
-    document.elementFromPoint(x, y).dispatchEvent(ev);
+    const ev = new MouseEvent('click');
+    event.target.querySelector('.mat-menu-item').dispatchEvent(ev);
     event.stopPropagation();
   }
 }