diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 44d9597a962..500fc908ed9 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,11 +1,6 @@
-{{- $dest_url := urls.Parse .Destination }}
-{{- $dest_path := $dest_url.Path }}
-{{- $image := .Page.Resources.GetMatch $dest_path }}
-{{- $url := .Destination | relURL }}
-{{- if $image }}
-	{{- $url = $image.RelPermalink }}
-	{{- if $dest_url.RawQuery }}
-		{{- $url = printf "%s?%s" $url $dest_url.RawQuery }}
-	{{- end }}
-{{- end }}
-<img src="{{ $url }}" alt="{{ .Text }}"{{ with .Title}} title="{{ . }}"{{ end }}>
+{{- partial "shortcodes/image.html" (dict
+  "context" .Page
+  "url" .Destination
+  "title" .Title
+  "alt" .Text
+) }}
\ No newline at end of file
diff --git a/layouts/partials/shortcodes/image.html b/layouts/partials/shortcodes/image.html
new file mode 100644
index 00000000000..bc7e1a8b38d
--- /dev/null
+++ b/layouts/partials/shortcodes/image.html
@@ -0,0 +1,15 @@
+{{- $context := .context }}
+{{- $url := .url }}
+{{- $title := .title }}
+{{- $alt := .alt }}
+{{- $dest_url := urls.Parse $url }}
+{{- $dest_path := $dest_url.Path }}
+{{- $image := $context.Resources.GetMatch $dest_path }}
+{{- $url = $url | relURL }}
+{{- if $image }}
+	{{- $url = $image.RelPermalink }}
+	{{- if $dest_url.RawQuery }}
+		{{- $url = printf "%s?%s" $url $dest_url.RawQuery }}
+	{{- end }}
+{{- end }}
+<img src="{{ $url }}" alt="{{ $alt }}"{{ with $title}} title="{{ . }}"{{ end }}>