diff --git a/exampleSite/hugo.yaml b/exampleSite/hugo.yaml
index 0da0ad99..5235f23f 100644
--- a/exampleSite/hugo.yaml
+++ b/exampleSite/hugo.yaml
@@ -142,6 +142,7 @@ params:
 
   editURL:
     enable: true
+    where: "single" # single | toc
     base: "https://github.com/imfing/hextra/edit/main/exampleSite/content"
 
   blog:
diff --git a/layouts/partials/components/last-updated.html b/layouts/partials/components/last-updated.html
index 7918fb12..22905e65 100644
--- a/layouts/partials/components/last-updated.html
+++ b/layouts/partials/components/last-updated.html
@@ -1,9 +1,28 @@
 {{- $lastUpdated := (T "lastUpdated") | default "Last updated on" -}}
+{{- $editThisPage := (T "editThisPage") | default "Edit this page"}}
 
 {{- if site.Params.displayUpdatedDate -}}
+  <div class="hx-mt-12 hx-mb-8 hx-block hx-text-xs hx-text-gray-500 ltr:hx-text-right rtl:hx-text-left dark:hx-text-gray-400">
+  {{- if and (site.Params.editURL.enable) (eq site.Params.editURL.where "single") -}}
+    {{- $editURL := site.Params.editURL.base | default "" -}}
+    {{- with .Params.editURL -}}
+      {{/* if `editURL` is set in the front matter */}}
+      {{- $editURL = . -}}
+    {{- else -}}
+      {{- with .File -}}
+        {{/* `.FileInfo.Meta.SourceRoot` is a Hugo internal field, e.g. `/path/to/repo/content/en/` */}}
+        {{- $sourceDir := replace (strings.TrimPrefix .FileInfo.Meta.BaseDir .FileInfo.Meta.SourceRoot) "\\" "/" -}}
+        {{- $sourceDir = strings.TrimPrefix "/content" $sourceDir -}}
+        {{- $path := replace .Path "\\" "/" -}}
+        {{- $editURL = urls.JoinPath $editURL $sourceDir $path -}}
+      {{- end -}}
+    {{- end -}}
+    <a class="mb-4 block text-xs text-gray-500 ltr:text-right rtl:text-left dark:text-gray-400" href="{{ $editURL }}" target="_blank" rel="noreferer">{{ $editThisPage }}</a>
+  {{- end -}}
   {{- with .Lastmod -}}
     {{ $datetime := (time.Format "2006-01-02T15:04:05.000Z" .) }}
-    <div class="hx-mt-12 hx-mb-8 hx-block hx-text-xs hx-text-gray-500 ltr:hx-text-right rtl:hx-text-left dark:hx-text-gray-400">{{ $lastUpdated }} <time datetime="{{ $datetime }}">{{ partial "utils/format-date" . }}</time></div>
+    <div class="hx-mt-4">{{ $lastUpdated }} <time datetime="{{ $datetime }}">{{ partial "utils/format-date" . }}</time></div>
+  </div>
   {{- else -}}
     <div class="hx-mt-16"></div>
   {{- end -}}
diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html
index 02cf98da..4c25671f 100644
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@@ -24,7 +24,7 @@
 
       {{/* TOC bottom part */}}
       <div class="{{ $borderClass }} hx-sticky hx-bottom-0 hx-flex hx-flex-col hx-items-start hx-gap-2 hx-pb-8 dark:hx-border-neutral-800 contrast-more:hx-border-t contrast-more:hx-border-neutral-400 contrast-more:hx-shadow-none contrast-more:dark:hx-border-neutral-400">
-        {{- if site.Params.editURL.enable -}}
+        {{- if and (site.Params.editURL.enable) (eq site.Params.editURL.where "toc") -}}
           {{- $editURL := site.Params.editURL.base | default "" -}}
           {{- with .Params.editURL -}}
             {{/* if `editURL` is set in the front matter */}}