diff --git a/zeppelin-web-angular/src/app/share/header/header.component.html b/zeppelin-web-angular/src/app/share/header/header.component.html
index f0dd608affa..d77aa12df72 100644
--- a/zeppelin-web-angular/src/app/share/header/header.component.html
+++ b/zeppelin-web-angular/src/app/share/header/header.component.html
@@ -52,19 +52,19 @@
       <ul nz-menu>
         <li nz-menu-item (click)="about()">About Zeppelin</li>
         <li nz-menu-divider></li>
-        <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">
+        <li nz-menu-item nzMatchRouter>
           <a [routerLink]="['/interpreter']">Interpreter</a>
         </li>
-        <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">
+        <li nz-menu-item nzMatchRouter>
           <a [routerLink]="['/notebook-repos']">Notebook Repos</a>
         </li>
-        <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">
+        <li nz-menu-item nzMatchRouter>
           <a [routerLink]="['/credential']">Credential</a>
         </li>
-        <!--        <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">-->
+        <!--        <li nz-menu-item nzMatchRouter>-->
         <!--          <a [routerLink]="['/helium']">Helium</a>-->
         <!--        </li>-->
-        <li nz-menu-item routerLinkActive="ant-dropdown-menu-item-selected">
+        <li nz-menu-item nzMatchRouter>
           <a [routerLink]="['/configuration']">Configuration</a>
         </li>
         <ng-container *ngIf="ticketService.ticket.principal !== 'anonymous'">
diff --git a/zeppelin-web-angular/src/styles/global.less b/zeppelin-web-angular/src/styles/global.less
index 42e736228c1..b72478b7837 100644
--- a/zeppelin-web-angular/src/styles/global.less
+++ b/zeppelin-web-angular/src/styles/global.less
@@ -115,6 +115,14 @@
   }
 }
 
+// Fix `a` tag in nz-dropdown-menu to be clickable with full width
+.ant-dropdown-menu-item > a::before {
+  position: absolute;
+  inset: 0;
+  background-color: transparent;
+  content: '';
+}
+
 //.view-lines {
 //  .view-line {
 //    &:first-child {