diff --git a/layouts/_default/faq.html b/layouts/_default/faq.html
index ee46270855..2866dfab79 100644
--- a/layouts/_default/faq.html
+++ b/layouts/_default/faq.html
@@ -9,11 +9,11 @@
     <hr/>
     <div class="directory" role="directory">
         <nav id="InlineTableOfContents">
-            <ul>
+            <ol>
                 {{ range $q := $sorted_questions }}
-                    <li><a href="#{{ $q.File.BaseFileName | urlize }}">{{ $q.Title }}</a></li>
+                    <li role="none" aria-label="{{ $q.Title }}"><a href="#{{ $q.File.BaseFileName | urlize }}">{{ $q.Title }}</a></li>
                 {{ end }}
-            </ul>
+            </ol>
         </nav>
     </div>
     <hr/>
diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html
index 8b5df31f2e..0123ba6fed 100644
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@@ -55,7 +55,7 @@
 
             {{ if $page.Scratch.Get "seeAlso" }}
                 {{ with $related }}
-                    <li><a href="#see-also">{{ i18n "see_also" }}</a></li>
+                    <li role="none" aria-label="{{ i18n "see_also" }}"><a href="#see-also">{{ i18n "see_also" }}</a></li>
                 {{ end }}
             {{ end }}
         </ol>