diff --git a/layouts/partials/social_links.html b/layouts/partials/social_links.html
index 5eaee1c..e0f5415 100644
--- a/layouts/partials/social_links.html
+++ b/layouts/partials/social_links.html
@@ -1,20 +1,7 @@
 <div class="social-links">
-  {{ with .Params.socialLinks.twitter }}
-    {{ if (and .id .user) }}
-    <div class="tweet social-quote">
-      <div class="title">
-        Discuss on twitter
-      </div>
-      {{- template "render-tweet" (dict "id" .id "user" .user "dnt" true) -}}
-    </div>
-    {{ end }}
-  {{ end }}
+  {{- with .Params.socialLinks.twitter }}
+    {{- if (and .id .user) }}
+    {{ partial "social_quote_tweet.html" (dict "user" .user "id" .id "title" "Discuss on Twitter") }}
+    {{- end }}
+  {{- end }}
 </div>
-
-{{- define "render-tweet" -}}
-  {{- $url := printf "https://twitter.com/%v/status/%v" .user .id -}}
-  {{- $query := querify "url" $url "dnt" .dnt -}}
-  {{- $request := printf "https://publish.twitter.com/oembed?%s" $query -}}
-  {{- $json := getJSON $request -}}
-  {{- replaceRE "<script.+/script>" "" $json.html | safeHTML -}}
-{{- end -}}
diff --git a/layouts/partials/social_quote_tweet.html b/layouts/partials/social_quote_tweet.html
new file mode 100644
index 0000000..b3068aa
--- /dev/null
+++ b/layouts/partials/social_quote_tweet.html
@@ -0,0 +1,13 @@
+<div class="tweet social-quote">
+  <div class="title">
+    {{ safeHTML (index site.Data.svg "twitter-simple") }}
+    {{ with .title }}<span>{{ . }}</span>{{ end }}
+  </div>
+
+  {{ $dnt := true }}
+  {{- $url := printf "https://twitter.com/%v/status/%v" .user .id -}}
+  {{- $query := querify "url" $url "dnt" $dnt -}}
+  {{- $request := printf "https://publish.twitter.com/oembed?%s" $query -}}
+  {{- $json := getJSON $request -}}
+  {{- replaceRE "<script.+/script>" "" $json.html | safeHTML -}}
+</div>
diff --git a/layouts/shortcodes/social-quote-tweet.html b/layouts/shortcodes/social-quote-tweet.html
index d8b21ca..205f0a9 100644
--- a/layouts/shortcodes/social-quote-tweet.html
+++ b/layouts/shortcodes/social-quote-tweet.html
@@ -1,16 +1 @@
-<div class="tweet social-quote">
-  <div class="title">
-    {{ safeHTML (index $.Site.Data.svg "twitter-simple") }}
-    {{ with .Inner }}<span>{{ . }}</span>{{ end }}
-  </div>
-  {{ $user := .Get "user" }}
-  {{ $id := .Get "id" }}
-  {{ $dnt := true }}
-  {{- .Inner -}}{{/* not required, only to not break Obsidian highlight by adding `/` before `>` */}}
-
-  {{- $url := printf "https://twitter.com/%v/status/%v" $user $id -}}
-  {{- $query := querify "url" $url "dnt" $dnt -}}
-  {{- $request := printf "https://publish.twitter.com/oembed?%s" $query -}}
-  {{- $json := getJSON $request -}}
-  {{- replaceRE "<script.+/script>" "" $json.html | safeHTML -}}
-</div>
+{{ partial "social_quote_tweet.html" (dict "user" (.Get "user") "id" (.Get "id") "title" .Inner) }}