diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 7122e62604..8706b40ee0 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -6,6 +6,7 @@
        [title]="('menu.section.icon.' + section.id) | translate"
        [routerLink]="itemModel.link"
        (keyup.space)="navigate($event)"
+       (keyup.enter)="navigate($event)"
        href="javascript:void(0);"
     >
       <div class="shortcut-icon">
diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index 900ade878e..50f9f8a79e 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -43,7 +43,7 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   }
 
   navigate(event: any): void {
-    event.stopPropagation();
+    event.preventDefault();
     if (this.hasLink) {
       this.router.navigate(this.itemModel.link);
     }
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 188f2d86b0..84402c64e9 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -37,7 +37,7 @@
             <a class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap"
                href="javascript:void(0);"
                (click)="toggle($event)"
-               (keyup.space)="$event.stopPropagation(); toggle($event)"
+               (keyup.space)="toggle($event)"
             >
               <div class="shortcut-icon">
                 <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 9ad76d50da..734c3d2ef9 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -8,7 +8,8 @@
      [attr.aria-expanded]="expanded | async"
      [title]="('menu.section.icon.' + section.id) | translate"
      (click)="toggleSection($event)"
-     (keyup.space)="$event.stopPropagation(); toggleSection($event)"
+     (keyup.space)="toggleSection($event)"
+     (keyup.enter)="toggleSection($event)"
   >
     <div class="shortcut-icon h-100">
       <i class="fas fa-{{section.icon}} fa-fw"></i>
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index 022133379b..4bbd5edb08 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -3,6 +3,8 @@
    [attr.aria-disabled]="!hasLink"
    [title]="item.text"
    [routerLink]="getRouterLink()"
+   (click)="$event.stopPropagation()"
    (keyup.space)="navigate($event)"
+   (keyup.enter)="navigate($event)"
    href="javascript:void(0);"
 >{{item.text | translate}}</a>
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.ts b/src/app/shared/menu/menu-item/link-menu-item.component.ts
index 86fe33fd47..42314bd362 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.ts
@@ -36,10 +36,11 @@ export class LinkMenuItemComponent implements OnInit {
   }
 
   navigate(event: any) {
-    event.stopPropagation();
+    event.preventDefault();
     if (this.getRouterLink()) {
       this.router.navigate([this.getRouterLink()]);
     }
+    event.stopPropagation();
   }
 
 }
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index c377a8cd0c..bf16a52c29 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -2,6 +2,7 @@
    class="nav-item nav-link"
    role="button"
    [title]="item.text"
-   (click)="item.function()"
-   (keyup.space)="$event.stopPropagation(); item.function()"
+   (click)="activate($event)"
+   (keyup.space)="activate($event)"
+   (keyup.enter)="activate($event)"
 >{{item.text | translate}}</a>
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 95b896ed64..002bfbc819 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -17,4 +17,10 @@ export class OnClickMenuItemComponent {
   constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel) {
     this.item = item;
   }
+
+  public activate(event: any) {
+    event.preventDefault();
+    this.item.function();
+    event.stopPropagation();
+  }
 }