diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index b687a77af..d3192d7d8 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -190,7 +190,7 @@ export const SidebarLayout = ({ children }: { children: React.ReactNode }) => {
   const [rotateChevron, setRotateChevron] = useState(false);
   const handleRotate = () => setRotateChevron(!rotateChevron);
   const rotate = rotateChevron ? 'rotate(180deg)' : 'rotate(0)';
-  const pathWtihoutFragment = extractPathWithoutFragment(router.asPath);
+  const pathWithoutFragment = extractPathWithoutFragment(router.asPath);
   useEffect(() => {
     if (window) {
       window.addEventListener('resize', () => {
@@ -213,19 +213,19 @@ export const SidebarLayout = ({ children }: { children: React.ReactNode }) => {
               setOpen(!open);
             }}
           >
-            {getDocsPath.includes(pathWtihoutFragment) && (
+            {getDocsPath.includes(pathWithoutFragment) && (
               <h3 className='text-white ml-12'>Introduction</h3>
             )}
-            {getStartedPath.includes(pathWtihoutFragment) && (
+            {getStartedPath.includes(pathWithoutFragment) && (
               <h3 className='text-white ml-12'>Get started</h3>
             )}
-            {getGuidesPath.includes(pathWtihoutFragment) && (
+            {getGuidesPath.includes(pathWithoutFragment) && (
               <h3 className='text-white ml-12'>Guides</h3>
             )}
-            {getReferencePath.includes(pathWtihoutFragment) && (
+            {getReferencePath.includes(pathWithoutFragment) && (
               <h3 className='text-white ml-12'>Reference</h3>
             )}
-            {getSpecificationPath.includes(pathWtihoutFragment) && (
+            {getSpecificationPath.includes(pathWithoutFragment) && (
               <h3 className='text-white ml-12'>Specification</h3>
             )}
             {router.pathname === null && (
@@ -280,6 +280,7 @@ export const SidebarLayout = ({ children }: { children: React.ReactNode }) => {
 };
 
 export const DocsNav = ({
+  open, // eslint-disable-line @typescript-eslint/no-unused-vars
   setOpen,
 }: {
   open: boolean;
@@ -294,7 +295,7 @@ export const DocsNav = ({
     getSpecification: false,
   });
   useEffect(() => {
-    const pathWtihoutFragment = extractPathWithoutFragment(router.asPath);
+    const pathWithoutFragment = extractPathWithoutFragment(router.asPath);
     const newActive = {
       getDocs: false,
       getStarted: false,
@@ -302,16 +303,15 @@ export const DocsNav = ({
       getReference: false,
       getSpecification: false,
     };
-    if (getDocsPath.includes(pathWtihoutFragment)) {
+    if (getDocsPath.includes(pathWithoutFragment)) {
       newActive.getDocs = true;
-    } else if (getStartedPath.includes(pathWtihoutFragment)) {
+    } else if (getStartedPath.includes(pathWithoutFragment)) {
       newActive.getStarted = true;
-      setActive({ ...active, getStarted: true });
-    } else if (getReferencePath.includes(pathWtihoutFragment)) {
+    } else if (getReferencePath.includes(pathWithoutFragment)) {
       newActive.getReference = true;
-    } else if (getSpecificationPath.includes(pathWtihoutFragment)) {
+    } else if (getSpecificationPath.includes(pathWithoutFragment)) {
       newActive.getSpecification = true;
-    } else if (getGuidesPath.includes(pathWtihoutFragment)) {
+    } else if (getGuidesPath.includes(pathWithoutFragment)) {
       newActive.getGuides = true;
     }
     setActive(newActive);
@@ -339,17 +339,30 @@ export const DocsNav = ({
     }
   }, [resolvedTheme]);
 
+  const handleAccordion = (section: keyof typeof active) => (open: boolean) => {
+    if (open) {
+      setActive({
+        getDocs: false,
+        getStarted: false,
+        getGuides: false,
+        getReference: false,
+        getSpecification: false,
+        [section]: true,
+      });
+    } else {
+      setActive((prev) => ({
+        ...prev,
+        [section]: false,
+      }));
+    }
+  };
+
   return (
     <div id='sidebar' className='lg:mt-8 w-4/5 mx-auto lg:ml-4'>
       {/* Introduction */}
       <Collapsible
         open={active.getDocs}
-        onOpenChange={(open) =>
-          setActive((prev) => ({
-            ...prev,
-            getDocs: open,
-          }))
-        }
+        onOpenChange={handleAccordion('getDocs')}
         className='my-2 bg-slate-200 dark:bg-slate-900 border-white border lg:border-hidden p-3 rounded transition-all duration-300 group'
       >
         <CollapsibleTrigger asChild>
@@ -451,12 +464,7 @@ export const DocsNav = ({
       {/* Get Started */}
       <Collapsible
         open={active.getStarted}
-        onOpenChange={(open) =>
-          setActive((prev) => ({
-            ...prev,
-            getStarted: open,
-          }))
-        }
+        onOpenChange={handleAccordion('getStarted')}
         className='mb-2 bg-slate-200 dark:bg-slate-900 p-3 rounded border border-white lg:border-hidden transition-all duration-300 group'
       >
         <CollapsibleTrigger asChild>
@@ -555,12 +563,7 @@ export const DocsNav = ({
       {/* Guides */}
       <Collapsible
         open={active.getGuides}
-        onOpenChange={(open) =>
-          setActive((prev) => ({
-            ...prev,
-            getGuides: open,
-          }))
-        }
+        onOpenChange={handleAccordion('getGuides')}
         className='mb-2 bg-slate-200 dark:bg-slate-900 p-3 rounded border border-white lg:border-hidden transition-all duration-300 group'
       >
         <CollapsibleTrigger asChild>
@@ -628,12 +631,7 @@ export const DocsNav = ({
       {/* Reference */}
       <Collapsible
         open={active.getReference}
-        onOpenChange={(open) =>
-          setActive((prev) => ({
-            ...prev,
-            getReference: open,
-          }))
-        }
+        onOpenChange={handleAccordion('getReference')}
         className='mb-2 bg-slate-200 dark:bg-slate-900 p-3 rounded border border-white lg:border-hidden transition-all duration-300 group'
       >
         <CollapsibleTrigger asChild>
@@ -811,12 +809,7 @@ export const DocsNav = ({
       {/* Specification */}
       <Collapsible
         open={active.getSpecification}
-        onOpenChange={(open) =>
-          setActive((prev) => ({
-            ...prev,
-            getSpecification: open,
-          }))
-        }
+        onOpenChange={handleAccordion('getSpecification')}
         className='mb-2 bg-slate-200 dark:bg-slate-900 p-3 rounded border border-white lg:border-hidden transition-all duration-300 group'
       >
         <CollapsibleTrigger asChild>
diff --git a/cypress/components/Sidebar.cy.tsx b/cypress/components/Sidebar.cy.tsx
index 76ddb5554..87d3bc402 100644
--- a/cypress/components/Sidebar.cy.tsx
+++ b/cypress/components/Sidebar.cy.tsx
@@ -192,14 +192,8 @@ describe('Sidebar Component', () => {
     });
 
     it('should render all navigation links correctly', () => {
-      // Expand all sections to check links
-      cy.contains('Introduction').parent().click();
-      cy.contains('Get Started').parent().click();
-      cy.contains('Guides').parent().click();
-      cy.contains('Reference').parent().click();
-      cy.contains('Specification').parent().click();
-
       // Check Introduction links
+      cy.contains('Introduction').parent().click();
       cy.contains('Overview').should('exist');
       cy.contains('What is JSON Schema?').should('exist');
       cy.contains('Roadmap').should('exist');
@@ -213,13 +207,20 @@ describe('Sidebar Component', () => {
       cy.contains('Code of conduct').should('exist');
 
       // Check Get Started links
+      cy.contains('Get Started').parent().click();
       cy.contains('What is a schema?').should('exist');
       cy.contains('The basics').should('exist');
       cy.contains('Create your first schema').should('exist');
       cy.contains('Tour of JSON Schema').should('exist');
       cy.contains('JSON Schema glossary').should('exist');
 
+      // Check Guides links
+      cy.contains('Guides').parent().click();
+      cy.contains('For implementers').should('exist');
+      cy.contains('Common interfaces across implementations').should('exist');
+
       // Check Reference links
+      cy.contains('Reference').parent().click();
       cy.contains('JSON Schema keywords').should('exist');
       cy.contains('JSON data types').should('exist');
       cy.contains('array').should('exist');
@@ -231,6 +232,7 @@ describe('Sidebar Component', () => {
       cy.contains('string').should('exist');
 
       // Check Specification links
+      cy.contains('Specification').parent().click();
       cy.contains('2020-12').should('exist');
       cy.contains('2019-09').should('exist');
       cy.contains('draft-07').should('exist');
@@ -239,23 +241,23 @@ describe('Sidebar Component', () => {
     });
 
     it('should handle external links correctly', () => {
-      // Expand sections to access external links
+      // Expand Introduction to access external links and check attributes and icons
       cy.contains('Introduction').parent().click();
-      cy.contains('Get Started').parent().click();
-      cy.contains('Reference').parent().click();
-
-      // Check external links have correct attributes
       cy.contains('Landscape').should('have.attr', 'target', '_blank');
+      cy.contains('Landscape').find('svg').should('exist');
+
+      // Expand Get Started to access external links and check attributes and icons
+      cy.contains('Get Started').parent().click();
       cy.contains('Tour of JSON Schema').should(
         'have.attr',
         'target',
         '_blank',
       );
-      cy.contains('Learn JSON Schema').should('have.attr', 'target', '_blank');
-
-      // Check external link icons
-      cy.contains('Landscape').find('svg').should('exist');
       cy.contains('Tour of JSON Schema').find('svg').should('exist');
+
+      // Expand Reference to access external links and check attributes and icons
+      cy.contains('Reference').parent().click();
+      cy.contains('Learn JSON Schema').should('have.attr', 'target', '_blank');
       cy.contains('Learn JSON Schema').find('svg').should('exist');
     });
 
@@ -300,19 +302,27 @@ describe('Sidebar Component', () => {
 
     it('should call onClick and setOpen when DocLinkBlank is clicked', () => {
       const mockSetOpen = cy.stub().as('mockSetOpen');
-
-      // Mount DocsNav with mocked setOpen
       cy.mount(<DocsNav open={false} setOpen={mockSetOpen} />);
 
-      // Expand sections to reveal external links
+      // Test Introduction external link (Landscape)
       cy.contains('Introduction').parent().click();
+      cy.contains('Landscape').trigger('click', { force: true });
+      cy.get('@mockSetOpen').should('have.been.calledWith', false);
+
+      // Reset the stub for next test
+      mockSetOpen.resetHistory();
+
+      // Test Get Started external link (Tour of JSON Schema)
       cy.contains('Get Started').parent().click();
-      cy.contains('Reference').parent().click();
+      cy.contains('Tour of JSON Schema').trigger('click', { force: true });
+      cy.get('@mockSetOpen').should('have.been.calledWith', false);
 
-      // Trigger the onClick event on the external link without causing navigation
-      cy.contains('Landscape').trigger('click', { force: true });
+      // Reset the stub for next test
+      mockSetOpen.resetHistory();
 
-      // Verify setOpen was called with false
+      // Test Reference external link (Learn JSON Schema)
+      cy.contains('Reference').parent().click();
+      cy.contains('Learn JSON Schema').trigger('click', { force: true });
       cy.get('@mockSetOpen').should('have.been.calledWith', false);
     });
 
@@ -338,15 +348,25 @@ describe('Sidebar Component', () => {
       // Mount DocsNav with mocked setOpen
       cy.mount(<DocsNav open={false} setOpen={mockSetOpen} />);
 
-      // Expand sections to reveal external links
+      // Test Introduction external link (Landscape)
       cy.contains('Introduction').parent().click();
+      cy.contains('Landscape').trigger('click', { force: true });
+      cy.get('@mockSetOpen').should('have.been.calledWith', false);
+
+      // Reset the stub for next test
+      mockSetOpen.resetHistory();
+
+      // Test Get Started external link (Tour of JSON Schema)
       cy.contains('Get Started').parent().click();
-      cy.contains('Reference').parent().click();
+      cy.contains('Tour of JSON Schema').trigger('click', { force: true });
+      cy.get('@mockSetOpen').should('have.been.calledWith', false);
 
-      // Trigger the onClick event on the external link without causing navigation
-      cy.contains('Landscape').trigger('click', { force: true });
+      // Reset the stub for next test
+      mockSetOpen.resetHistory();
 
-      // Verify setOpen was called with false even without custom onClick
+      // Test Reference external link (Learn JSON Schema)
+      cy.contains('Reference').parent().click();
+      cy.contains('Learn JSON Schema').trigger('click', { force: true });
       cy.get('@mockSetOpen').should('have.been.calledWith', false);
     });
 
@@ -470,13 +490,16 @@ describe('Sidebar Component', () => {
     });
 
     it('should handle section subtitles correctly', () => {
-      // Expand sections to see subtitles
+      // Test Get Started section subtitles
       cy.contains('Get Started').parent().click();
+      cy.contains('Examples').should('have.class', 'italic');
+
+      // Test Reference section subtitles (if any exist)
       cy.contains('Reference').parent().click();
-      cy.contains('Specification').parent().click();
+      // Note: Based on code, Reference section doesn't seem to have subtitles
 
-      // Check subtitles are rendered with correct styling
-      cy.contains('Examples').should('have.class', 'italic');
+      // Test Specification section subtitles
+      cy.contains('Specification').parent().click();
       cy.contains('Versions').should('have.class', 'italic');
     });