diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
index 08e80ded..c0ba6b5d 100644
--- a/layouts/shortcodes/image.html
+++ b/layouts/shortcodes/image.html
@@ -1,16 +1,14 @@
-<p>
 {{ if .Get "caption"}}
 <figure>
   <picture>
+{{ else }}
+<p>
 {{ end }}
-<img
-  src="{{ .Get "src" }}"
-  alt="{{ .Get "alt" }}"
-{{ if .Get "width"}}  width="{{ .Get "width" }}px"{{ end }}
-{{ if .Get "caption"}}  title="{{ .Get "caption"}}"{{ end }}>
+<img src="{{ .Get "src" }}" alt="{{ .Get "alt" }}"{{ if .Get "width"}} width="{{ .Get "width" }}"{{ end }}{{ if .Get "caption"}} title="{{ .Get "caption"}}"{{ end }}>
 {{ if .Get "caption"}}
   </picture>
   <figcaption>{{ .Get "caption" }}</figcaption>
 </figure>
+{{ else }}
+</p>
 {{ end }}
-</p>
\ No newline at end of file