diff --git a/blocks/header/header.js b/blocks/header/header.js
index 5a52a3c..b39a445 100644
--- a/blocks/header/header.js
+++ b/blocks/header/header.js
@@ -129,8 +129,13 @@ async function delayedNavTools() {
         closeLoginModal();
         document.body.classList.remove('overflow-hidden');
       }
-      nav.setAttribute('aria-expanded', expanded ? 'false' : 'true');
+
+      // Setting both primary and secondary nav aria-expanded
+      document.querySelector('primary-nav').setAttribute('aria-expanded', expanded ? 'false' : 'true');
+      document.querySelector('secondary-nav').setAttribute('aria-expanded', expanded ? 'false' : 'true');
+
       toggleHamburger();
+      window.scrollTo(0, 0); // Scrolling to Top
     });
 
     const querySearch = nav.querySelector('.nav-tools-search');
diff --git a/blocks/header/nav-utils.js b/blocks/header/nav-utils.js
index b87435a..e9ad6e7 100644
--- a/blocks/header/nav-utils.js
+++ b/blocks/header/nav-utils.js
@@ -196,8 +196,12 @@ export async function loadNavTools() {
       });
 
       externalMarkup.appendChild(hamburgerModal);
-      document.querySelector('.nbd-hamburger-close-icon').addEventListener('click', () => {
-        document.querySelector('.nav-hamburger').click();
+
+      const icons = document.querySelectorAll('.nbd-hamburger-close-icon');
+      icons.forEach((x) => {
+        x.addEventListener('click', () => {
+          document.querySelector('.nav-hamburger').click();
+        });
       });
     }