diff --git a/templates/modular.html.twig b/templates/modular.html.twig
index 90373db..1fd0f70 100644
--- a/templates/modular.html.twig
+++ b/templates/modular.html.twig
@@ -14,11 +14,18 @@
 
     <script>
     // singlePageNav initialization & configuration
-    $('ul.navigation').singlePageNav({
+    $('nav').singlePageNav({
         offset: $('#header').outerHeight(),
-        filter: ':not(.external)',
+        filter: 'a[href*="#"]',
         updateHash: true,
-        currentClass: 'active'
+        currentClass: 'active',
+        beforeStart: function() {
+            if ($('body').hasClass('mobile-nav-open')) {
+                $('#toggle').removeClass('active');
+                $('#overlay').removeClass('open');
+                $('body').removeClass('mobile-nav-open');
+            }
+        }
     });
     </script>