diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index 9d2e232181..1d353c7f7b 100644
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -37,7 +37,7 @@
         {{ end }}
         {{ end }}
         {{ if not .Params.noedit }}
-        <a href="{{ printf "%s#%s" ("docs/editdocs" | relURL) .Path | safeURL }}" class="button issue">{{ T "main_edit_this_page" }}</a>
+        <a href="https://github.com/kubernetes/website/edit/master/content/{{ .Site.Language.Lang }}/{{ .File.Path }}" class="button issue">{{ T "main_edit_this_page" }}</a>
         {{ end }}
       </div>
       {{ if not .Params.showcommit }}
diff --git a/layouts/partials/docs/content_page.html b/layouts/partials/docs/content_page.html
index 1919b95232..533c5c3d3a 100644
--- a/layouts/partials/docs/content_page.html
+++ b/layouts/partials/docs/content_page.html
@@ -1,4 +1,4 @@
-<p><a href="https://github.com/kubernetes/website/edit/master/content/en/{{ .page.File.Path }}" id="editPageButton" target="_blank">Edit This Page</a></p>
+<p><a href="https://github.com/kubernetes/website/edit/master/content/{{ .page.Lang }}/{{ .page.File.Path }}" id="editPageButton" target="_blank">Edit This Page</a></p>
 {{ if not .page.Params.notitle }}
 <h1>{{ .page.Title }}</h1>
 {{ end }}