diff --git a/lib/core/Doc.js b/lib/core/Doc.js
index a12e076c3c..a263431f04 100644
--- a/lib/core/Doc.js
+++ b/lib/core/Doc.js
@@ -20,29 +20,39 @@ const translateThisDoc = translate(
 // inner doc component for article itself
 class Doc extends React.Component {
   render() {
-    let editLink = !this.props.version &&
-      this.props.config.editUrl && (
+    let docSource = this.props.source;
+
+    if (this.props.version && this.props.version !== 'next') {
+      // If versioning is enabled and the current version is not next, we need to trim out "version-*" from the source if we want a valid edit link.
+      docSource = docSource.match(new RegExp(/version-.*\/(.*\.md)/, 'i'))[1];
+    }
+
+    let editLink = this.props.config.editUrl && (
+      <a
+        className="edit-page-link button"
+        href={this.props.config.editUrl + docSource}
+        target="_blank">
+        {editThisDoc}
+      </a>
+    );
+
+    // If internationalization is enabled, show Recruiting link instead of Edit Link.
+    if (
+      this.props.language != 'en' &&
+      this.props.config.translationRecruitingLink
+    ) {
+      editLink = (
         <a
           className="edit-page-link button"
-          href={this.props.config.editUrl + this.props.source}
+          href={
+            this.props.config.translationRecruitingLink +
+            '/' +
+            this.props.language
+          }
           target="_blank">
-          {editThisDoc}
+          {translateThisDoc}
         </a>
       );
-    if (this.props.language != 'en') {
-      editLink = !this.props.version &&
-        this.props.config.translationRecruitingLink && (
-          <a
-            className="edit-page-link button"
-            href={
-              this.props.config.translationRecruitingLink +
-              '/' +
-              this.props.language
-            }
-            target="_blank">
-            {translateThisDoc}
-          </a>
-        );
     }
     return (
       <div className="post">
diff --git a/lib/core/DocsLayout.js b/lib/core/DocsLayout.js
index 32125a2962..0c6633ed35 100644
--- a/lib/core/DocsLayout.js
+++ b/lib/core/DocsLayout.js
@@ -52,6 +52,7 @@ class DocsLayout extends React.Component {
                     this.props.metadata.title
                   : this.props.metadata.title
               }
+              version={metadata.version}
               language={metadata.language}
             />
             <div className="docs-prevnext">