diff --git a/docs/examples/focused-mode.html b/docs/examples/focused-mode.html
index d5b5e51f..13b79d6a 100644
--- a/docs/examples/focused-mode.html
+++ b/docs/examples/focused-mode.html
@@ -26,6 +26,7 @@
       allow-try="true" 
       regular-font="Open Sans"
       mono-font = "Roboto Mono"
+      on-nav-tag-click="show-description"
     > </rapi-doc>
   </body>
 </html>
\ No newline at end of file
diff --git a/docs/specs/petstore_extended.yaml b/docs/specs/petstore_extended.yaml
index 91ac5194..a710c8b0 100644
--- a/docs/specs/petstore_extended.yaml
+++ b/docs/specs/petstore_extended.yaml
@@ -107,15 +107,19 @@ externalDocs:
 tags:
   - name: pet
     description: Everything about your Pets
+    x-tag-expanded: false
   - name: store
     description: Access to Petstore orders
     x-tag-expanded: false
   - name: user
     description: Operations about user
+    x-tag-expanded: false
   - name: pet_model
     description: The Pet Model
+    x-tag-expanded: false
   - name: store_model
     description: The Order Model
+    x-tag-expanded: false
 paths:
   /pet:
     parameters:
diff --git a/src/templates/navbar-template.js b/src/templates/navbar-template.js
index 719e44a0..fe555d2a 100644
--- a/src/templates/navbar-template.js
+++ b/src/templates/navbar-template.js
@@ -45,6 +45,16 @@ export function navBarClickAndEnterHandler(event) {
   event.stopPropagation();
   if (navEl.dataset?.action === 'navigate') {
     this.scrollToEventTarget(event, false);
+    const tagAndPathEl = navEl?.closest('.nav-bar-tag-and-paths');
+    let wasExpanded = false;
+    if (tagAndPathEl) {
+      wasExpanded = tagAndPathEl.classList.contains('expanded');
+    }
+    expandCollapseAll(event, 'collapse-all');
+    expandCollapseNavBarTag(navEl, 'toggle');
+    if (wasExpanded) {
+      expandCollapseNavBarTag(navEl, 'toggle');
+    }
   } else if (navEl.dataset?.action === 'expand-all' || (navEl.dataset?.action === 'collapse-all')) {
     expandCollapseAll(event, navEl.dataset.action);
   } else if (navEl.dataset?.action === 'expand-collapse-tag') {
@@ -182,7 +192,7 @@ export default function navbarTemplate() {
                   tabindex='0'
                 >
                   <div style="pointer-events:none;">${tag.displayName || tag.name}</div>
-                  <div class='nav-bar-tag-icon' tabindex='0' data-action='expand-collapse-tag'></div>
+                  <div class='nav-bar-tag-icon' style="pointer-events:none;"></div>
                 </div>
               `
             }