diff --git a/ietf/static/js/document_html.js b/ietf/static/js/document_html.js
index 7de6660c2..6e8861739 100644
--- a/ietf/static/js/document_html.js
+++ b/ietf/static/js/document_html.js
@@ -42,10 +42,8 @@ document.addEventListener("DOMContentLoaded", function (event) {
 
     // Set up a nav pane
     const toc_pane = document.getElementById("toc-nav");
-    populate_nav(toc_pane,
-        `#content h2, #content h3, #content h4, #content h5, #content h6
-         #content .h1, #content .h2, #content .h3, #content .h4, #content .h5, #content .h6`,
-        ["py-0"]);
+    const headings = document.querySelectorAll(`#content :is(h2, h3, h4, h5, h6, .h2, .h3, .h4, .h5, .h6)`);
+    populate_nav(toc_pane, headings, ["py-0"]);
 
     // activate pref buttons selected by pref cookies or localStorage
     const in_localStorage = ["deftab", "reflinks"];
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index 11d5a5175..353dba005 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -152,7 +152,7 @@ $(document)
 $(function () {
     const contentElement = $('#content.ietf-auto-nav');
     if (contentElement.length > 0) {
-        const heading_selector = ":is(h2, h3, h4, h5, h6, .nav-heading):not([style='display:none']):not(.navskip)";
+        const heading_selector = ":is(h2, h3, h4, h5, h6, .h2, .h3, .h4, .h5, .h6, .nav-heading):not([style='display:none']):not(.navskip)";
         const headings = contentElement
             .find(heading_selector)
             .filter((i, el) => !el.closest(".navskip"));