diff --git a/_data/doc-nav-header.yml b/_data/doc-nav-header.yml
index 5f9e5b9b0c..d79dcb1934 100644
--- a/_data/doc-nav-header.yml
+++ b/_data/doc-nav-header.yml
@@ -27,7 +27,7 @@
       url: "/overviews/index.html"
     - title: Books
       url: "/books.html"
-    - title: Scala FAQs
+    - title: Scala FAQ
       url: "/tutorials/FAQ/index.html"
     - title: Language Spec
       url: http://scala-lang.org/files/archive/spec/2.13/
diff --git a/_overviews/FAQ/index.md b/_overviews/FAQ/index.md
index b7bc4f4522..b2c9fc0baa 100644
--- a/_overviews/FAQ/index.md
+++ b/_overviews/FAQ/index.md
@@ -1,6 +1,6 @@
 ---
 layout: singlepage-overview
-title: Scala FAQs
+title: Scala FAQ
 permalink: /tutorials/FAQ/index.html
 redirect_from: "/tutorials/FAQ/breakout.html"
 redirect_from: "/tutorials/FAQ/chaining-implicits.html"
diff --git a/resources/js/functions.js b/resources/js/functions.js
index 046ec1a7f5..34a334f9d0 100644
--- a/resources/js/functions.js
+++ b/resources/js/functions.js
@@ -505,6 +505,8 @@ $(document).ready(function () {
   let isInOverviewsFolder = overviewsFolders.some(of => thisPageUrl.startsWith(of));
   if(isRootFile) {
     thisPageUrl = thisPageUrl + '.md';
+  } else if(thisPageUrl.indexOf("tutorials/FAQ/") == 0) {
+    thisPageUrl = '_overviews/' + thisPageUrl.substring("tutorials/".length) + '.md';
   } else if(isInOverviewsFolder) {
     thisPageUrl = '_overviews/'+ thisPageUrl + '.md';
   } else {