diff --git a/ui/app/styles/components/popup-menu.scss b/ui/app/styles/components/popup-menu.scss
index 56446ab912..2c78604e89 100644
--- a/ui/app/styles/components/popup-menu.scss
+++ b/ui/app/styles/components/popup-menu.scss
@@ -55,7 +55,8 @@
       color: $menu-item-hover-color;
     }
 
-    &.is-active {
+    &.active,
+    .is-active {
       background-color: $menu-item-active-background-color;
       color: $menu-item-active-color;
     }
diff --git a/ui/app/templates/vault/cluster.hbs b/ui/app/templates/vault/cluster.hbs
index b872685571..3663a3fefe 100644
--- a/ui/app/templates/vault/cluster.hbs
+++ b/ui/app/templates/vault/cluster.hbs
@@ -12,10 +12,11 @@
             <NamespacePicker @class="navbar-item" @namespace={{this.namespaceQueryParam}} />
           </li>
         {{/if}}
-        <li class={{if (is-active-route "vault.cluster.secrets") "is-active"}}>
+        <li>
           <LinkTo
             @route="vault.cluster.secrets"
             @current-when="vault.cluster.secrets vault.cluster.settings.mount-secret-backend vault.cluster.settings.configure-secret-backend"
+            class={{if (is-active-route "vault.cluster.secrets") "is-active"}}
             {{on "click" Nav.closeDrawer}}
             data-test-navbar-item="secrets"
           >
@@ -23,11 +24,12 @@
           </LinkTo>
         </li>
         {{#if (has-permission "access")}}
-          <li class={{if (is-active-route "vault.cluster.access") "is-active"}}>
+          <li>
             <LinkTo
               @route={{get (route-params-for "access") "route"}}
               @models={{get (route-params-for "access") "models"}}
               @current-when="vault.cluster.access vault.cluster.settings.auth"
+              class={{if (is-active-route "vault.cluster.access") "is-active"}}
               {{on "click" Nav.closeDrawer}}
               data-test-navbar-item="access"
             >
@@ -36,11 +38,12 @@
           </li>
         {{/if}}
         {{#if (has-permission "policies")}}
-          <li class={{if (is-active-route (array "vault.cluster.policies" "vault.cluster.policy")) "is-active"}}>
+          <li>
             <LinkTo
               @route="vault.cluster.policies"
               @models={{get (route-params-for "policies") "models"}}
               @current-when="vault.cluster.policies vault.cluster.policy"
+              class={{if (is-active-route (array "vault.cluster.policies" "vault.cluster.policy")) "is-active"}}
               {{on "click" Nav.closeDrawer}}
               data-test-navbar-item="policies"
             >
@@ -49,10 +52,11 @@
           </li>
         {{/if}}
         {{#if (has-permission "tools")}}
-          <li class={{if (is-active-route "vault.cluster.tools") "is-active"}}>
+          <li>
             <LinkTo
               @route="vault.cluster.tools.tool"
               @models={{get (route-params-for "tools") "models"}}
+              class={{if (is-active-route "vault.cluster.tools") "is-active"}}
               {{on "click" Nav.closeDrawer}}
             >
               Tools