diff --git a/src/templates/mapping.go b/src/templates/mapping.go
index 3df02dde..dee349b3 100644
--- a/src/templates/mapping.go
+++ b/src/templates/mapping.go
@@ -297,6 +297,8 @@ func LinkToTemplate(link *models.Link) Link {
 	return tlink
 }
 
+var controlCharRegex = regexp.MustCompile(`\p{Cc}`)
+
 func TimelineItemsToJSON(items []TimelineItem) string {
 	// NOTE(asaf): As of 2021-06-22: This only serializes the data necessary for snippet showcase.
 	builder := strings.Builder{}
@@ -314,11 +316,13 @@ func TimelineItemsToJSON(items []TimelineItem) string {
 
 		builder.WriteString(`"description":"`)
 		jsonString := string(item.Description)
+		jsonString = strings.ToValidUTF8(jsonString, "")
 		jsonString = strings.ReplaceAll(jsonString, `\`, `\\`)
 		jsonString = strings.ReplaceAll(jsonString, `"`, `\"`)
 		jsonString = strings.ReplaceAll(jsonString, "\n", "\\n")
 		jsonString = strings.ReplaceAll(jsonString, "\r", "\\r")
 		jsonString = strings.ReplaceAll(jsonString, "\t", "\\t")
+		jsonString = controlCharRegex.ReplaceAllString(jsonString, "")
 		builder.WriteString(jsonString)
 		builder.WriteString(`",`)
 
diff --git a/src/templates/src/include/showcase_templates.html b/src/templates/src/include/showcase_templates.html
index c640a927..afaa96c5 100644
--- a/src/templates/src/include/showcase_templates.html
+++ b/src/templates/src/include/showcase_templates.html
@@ -27,7 +27,7 @@
 				<a class="user" data-tmpl="userLink"></a>
 				<a data-tmpl="date" class="datetime tr" style="flex: 1 1 auto;"></a>
 			</div>
-			<div data-tmpl="description">
+			<div class="pre overflow-auto" data-tmpl="description">
 				Unknown description
 			</div>
 			<div data-tmpl="tags" class="pt2 flex"></div>
@@ -42,4 +42,4 @@
 
 <template id="timeline_item_tag">
 <div data-tmpl="tag" class="bg-theme-dimmer ph2 pv1 br2"></div>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/templates/src/snippet.html b/src/templates/src/snippet.html
index c0066339..0a96e240 100644
--- a/src/templates/src/snippet.html
+++ b/src/templates/src/snippet.html
@@ -8,7 +8,7 @@
 			<a class="user" href="{{ .Snippet.OwnerUrl }}">{{ .Snippet.OwnerName }}</a>
 			<a class="tr" style="flex: 1 1 auto;" href="{{ .Snippet.Url }}">{{ timehtml (relativedate .Snippet.Date) .Snippet.Date }}</a>
         </div>
-        <p class="mb2">{{ .Snippet.Description }}</p>
+        <div class="pre overflow-auto mb2">{{ .Snippet.Description }}</div>
         <div>
             {{ range .Snippet.EmbedMedia }}
                 {{ if eq .Type mediaimage }}