diff --git a/layouts/_partials/list.html b/layouts/_partials/list.html
index 80026ae2e..ba0d64a74 100644
--- a/layouts/_partials/list.html
+++ b/layouts/_partials/list.html
@@ -6,7 +6,12 @@ <h1 class="title">
           {{- i18n .Data.Plural 1 | title -}}
           {{- print ": " -}}
         {{- end -}}
-        {{- i18n (lower .Title) | default .Title | title -}}
+
+        {{- if and site.Params.preserveTags (eq .Kind "term") (eq .Data.Plural "tags") -}}
+          {{- .Data.Term -}}
+        {{- else -}}
+          {{- i18n (lower .Title) | default .Title | title -}}
+        {{- end -}}
       </a>
     </h1>
   </header>
diff --git a/layouts/_partials/taxonomy/tags.html b/layouts/_partials/taxonomy/tags.html
index 58211a201..2024d68e2 100644
--- a/layouts/_partials/taxonomy/tags.html
+++ b/layouts/_partials/taxonomy/tags.html
@@ -5,7 +5,13 @@
       <span class="separator">•</span>
     {{- end }}
     <span class="tag">
-      <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
+      <a href="{{ .RelPermalink }}">
+        {{ if site.Params.preserveTags }}
+            {{ .Data.Term }}
+        {{ else }}
+            {{ .LinkTitle }}
+        {{ end }}
+      </a>
     </span>
   {{- end -}}
 </div>
diff --git a/layouts/list.html b/layouts/list.html
index cf15efb3c..3fd436395 100644
--- a/layouts/list.html
+++ b/layouts/list.html
@@ -3,8 +3,17 @@
     {{- i18n .Data.Plural 1 | title -}}
     {{- print ": " -}}
   {{- end -}}
-  {{- i18n (lower .Title) | default .Title | title }} · {{ .Site.Title -}}
+
+  {{- if and site.Params.preserveTags (eq .Data.Plural "tags") -}}
+    {{- .Data.Term -}}
+  {{- else -}}
+    {{- i18n (lower .Title) | default .Title | title -}}
+  {{- end }}
+
+  · {{ .Site.Title -}}
 {{ end }}
+
 {{ define "content" }}
   {{ partial "list.html" . }}
 {{ end }}
+