diff --git a/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs b/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
index f76cd0bc5e..02ff8c0a6e 100644
--- a/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
@@ -13,22 +13,20 @@
       <ul class="link-dropdown-menu" id="tools_dropdown">
         <li class="dropdown-header">Tools</li>
         <li class="dropdown-item">
-          <a id="shell" class="internalLink" href="#shell">JS Shell</a>
+          <a id="shell" class="tab" href="#shell">JS Shell</a>
         </li>
 
-                    <% if (isSystem) { %>
+        <% if (isSystem) { %>
+          <li class="dropdown-item">
+            <a id="logs" class="tab" href="#logs">Logs</a>
+          </li>
+        <% } %>
 
         <li class="dropdown-item">
-          <a id="logs" class="internalLink" href="#logs">Logs</a>
-        </li>
-
-                    <% } %>
-
-        <li class="dropdown-item">
-          <a id="api" class="internalLink" href="#api">API</a>
+          <a id="api" class="tab" href="#api">API</a>
         </li>
         <li class="dropdown-item">
-          <a id="userManagement" class="internalLink" href="#api">User Management</a>
+          <a id="userManagement" class="tab" href="#api">User Management</a>
         </li>
       </ul>
     </li>
diff --git a/js/apps/system/aardvark/frontend/js/views/navigationView.js b/js/apps/system/aardvark/frontend/js/views/navigationView.js
index e07040aa46..5565cfa7b7 100644
--- a/js/apps/system/aardvark/frontend/js/views/navigationView.js
+++ b/js/apps/system/aardvark/frontend/js/views/navigationView.js
@@ -8,7 +8,6 @@
     events: {
       "change #arangoCollectionSelect": "navigateBySelect",
       "click .tab": "navigateByTab",
-      "click .internalLink": "navigateByTab",
       "mouseenter .dropdown": "showDropdown",
       "mouseleave .dropdown": "hideDropdown"
     },
diff --git a/js/apps/system/aardvark/frontend/scss/_navbar.scss b/js/apps/system/aardvark/frontend/scss/_navbar.scss
index 0170bc76fd..bab438ea64 100644
--- a/js/apps/system/aardvark/frontend/scss/_navbar.scss
+++ b/js/apps/system/aardvark/frontend/scss/_navbar.scss
@@ -49,6 +49,10 @@ ul.navlist {
   }
   li.dropdown-item {
     margin-left: 0px;
+
+    a {
+      display: block;
+    }
   }
 }
 
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index 82c440d322..c5e3174cac 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -487,6 +487,8 @@ ul.navlist {
     background-color: #8aa051; }
   ul.navlist li.dropdown-item {
     margin-left: 0px; }
+    ul.navlist li.dropdown-item a {
+      display: block; }
 
 a.tab {
   padding-top: 9px;