diff --git a/lib/core/DocsLayout.js b/lib/core/DocsLayout.js
index bf0bea199f..117202dcd3 100644
--- a/lib/core/DocsLayout.js
+++ b/lib/core/DocsLayout.js
@@ -63,8 +63,13 @@ class DocsLayout extends React.Component {
                   {i18n
                     ? translation[this.props.metadata.language][
                         "localized-strings"
-                      ]["previous"] || "Previous"
-                    : "Previous"}
+                      ][metadata.previous_id] ||
+                      translation[this.props.metadata.language][
+                        "localized-strings"
+                      ]["previous"] ||
+                      "Previous"
+                    : metadata.previous_title || "Previous"
+                  }
                 </a>
               )}
               {metadata.next_id && (
@@ -74,8 +79,13 @@ class DocsLayout extends React.Component {
                   {i18n
                     ? translation[this.props.metadata.language][
                         "localized-strings"
-                      ]["next"] || "Next"
-                    : "Next"}{" "}
+                      ][metadata.next_id] ||
+                      translation[this.props.metadata.language][
+                        "localized-strings"
+                      ]["next"] ||
+                      "Next"
+                    : metadata.next_title || "Next"
+                  }{" "}
                   →
                 </a>
               )}
diff --git a/lib/server/readMetadata.js b/lib/server/readMetadata.js
index 792afc9a5c..cf60cc2736 100644
--- a/lib/server/readMetadata.js
+++ b/lib/server/readMetadata.js
@@ -289,6 +289,17 @@ function generateMetadataDocs() {
     metadatas[metadata.id] = metadata;
   });
 
+  // Get the titles of the previous and next ids so that we can use them in
+  // navigation buttons in DocsLayout.js
+  Object.keys(metadatas).forEach(function(metadata) {
+    if (metadatas[metadata].previous) {
+      metadatas[metadata].previous_title = metadatas[metadatas[metadata].previous].title;
+    }
+    if (metadatas[metadata].next) {
+      metadatas[metadata].next_title = metadatas[metadatas[metadata].next].title;
+    }
+  });
+
   fs.writeFileSync(
     __dirname + "/../core/metadata.js",
     "/**\n" +