diff --git a/layouts/shortcodes/youtube.html b/layouts/shortcodes/youtube.html
index 12d00b0..25c6283 100644
--- a/layouts/shortcodes/youtube.html
+++ b/layouts/shortcodes/youtube.html
@@ -3,8 +3,6 @@
 {{ $code = (.Get "code") }}
 {{ else if (.Get "src") }}
 {{ $code = (.Get "src") }}
-{{ (strings.ReplaceRE `(http(?:s)?:\/\/(?:www\.)?youtu(?:(?:be\.com)|(?:\.be))|(?:be-nocookie\.com))\/(?:(?:watch\?v=)|(?:embed\/)|(?:\/v\/))?(.+)?(?:\&|\?)` "" $code) }}
-
+{{ $code = (strings.ReplaceRE `(http(?:s)?:\/\/(?:www\.)?youtu(?:(?:be\.com)|(?:\.be))|(?:be-nocookie\.com))\/(?:(?:watch\?v=)|(?:embed\/)|(?:\/v\/))?(.+)?(?:\&|\?)` "" $code) }}
+<a class=youtubelink href="https://youtu.be/{{ $code }}"><img src="http://i3.ytimg.com/vi/{{ $code }}/hqdefault.jpg"/></a>
 {{ end }}
-<img src="http://i3.ytimg.com/vi/{{ .Get "code" }}/hqdefault.jpg"/>
-