diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e6cc177..c1a8640 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -14,9 +14,9 @@
         </i>
       </span>
       {{ if .Params.link }}
-        <a href="{{ .Params.link }}" target="_blank">{{ .Title }} ↪</a>
+        <a href="{{ .Params.link | replaceRE "\\.html$" "" }}" target="_blank">{{ .Title }} ↪</a>
       {{ else }}
-        <a href="{{ .RelPermalink }}">{{ .Title }}</a>
+        <a href="{{ .RelPermalink | replaceRE "\\.html$" "" }}">{{ .Title }}</a>
       {{ end }}
     </li>
     {{ else }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2baecc4..6520c2a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -13,7 +13,7 @@
 </content>
 <p>
   {{ range (.GetTerms "tags") }}
-    <a class="blog-tags" href="{{ .RelPermalink }}">#{{ lower .LinkTitle }}</a>
+    <a class="blog-tags" href="{{ .RelPermalink | replaceRE "\\.html$" "" }}">#{{ lower .LinkTitle }}</a>
   {{ end }}
 </p>
 {{ if not .Params.hideReply }}
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index 53be338..b77c1cd 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -1,5 +1,5 @@
 {{ range .Site.Menus.main.ByWeight }}
-  <a href="{{ .URL }}">{{ .Name }}</a>
+  <a href="{{ .URL | replaceRE "\\.html$" "" }}">{{ .Name }}</a>
 {{ end }}
 <a href='{{ absURL "index.xml" }}'>RSS</a>