diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 5b73108c2..84ddd3234 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -28,11 +28,11 @@ <h4 class="title"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
             {{ end }}
 					<div class="description">
 						{{ if isset .Params "description" }}
-							{{ .Description }}
+							{{ .Description | markdownify }}
 						{{ else if gt (len .RawContent) 120 }}
-							{{ slicestr .RawContent 0 120 }}...
+							{{ slicestr .RawContent 0 120 | markdownify }}...
 						{{ else }}
-							{{ .RawContent }}
+							{{ .RawContent | markdownify}}
 						{{ end }}
 					</div>
 				</div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 253dc4c8e..d6ef14890 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -16,7 +16,7 @@ <h3 class="title">{{ .Title }}</h3>
 				{{ else if in .Params.link "twitter.com" }}
 					<!-- twitter -->
 					<p><a href="{{ .Params.link }}" rel="noopener noreferrer">View on Twitter &rarr;</a></p>
-				{{ else }}
+				{{ else if isset .Params "link" }}
 					<p><a href="{{ .Params.link }}" rel="noopener noreferrer">Go to link &rarr;</a></p>
 				{{ end }}