diff --git a/core/themes/olivero/js/second-level-navigation.es6.js b/core/themes/olivero/js/second-level-navigation.es6.js
index 23efa82133d..21ef42948ef 100644
--- a/core/themes/olivero/js/second-level-navigation.es6.js
+++ b/core/themes/olivero/js/second-level-navigation.es6.js
@@ -166,9 +166,7 @@
     (e) => {
       if (
         areAnySubNavsOpen() &&
-        !e.target.matches(
-          '.primary-nav__menu-item--has-children, .primary-nav__menu-item--has-children *',
-        )
+        !e.target.matches('.header-nav, .header-nav *')
       ) {
         closeAllSubNav();
       }
diff --git a/core/themes/olivero/js/second-level-navigation.js b/core/themes/olivero/js/second-level-navigation.js
index 7a37c57c4f6..6f49eac3af0 100644
--- a/core/themes/olivero/js/second-level-navigation.js
+++ b/core/themes/olivero/js/second-level-navigation.js
@@ -103,7 +103,7 @@
     }
   });
   document.addEventListener('touchstart', function (e) {
-    if (areAnySubNavsOpen() && !e.target.matches('.primary-nav__menu-item--has-children, .primary-nav__menu-item--has-children *')) {
+    if (areAnySubNavsOpen() && !e.target.matches('.header-nav, .header-nav *')) {
       closeAllSubNav();
     }
   }, {