diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs
index ed1f7b1..cd45ba1 100644
--- a/make-pages/SinglePage.hs
+++ b/make-pages/SinglePage.hs
@@ -82,7 +82,7 @@ make' nsfw dir info@(Info {date, title, artist}) = [b|@0
 
     images      = imagesFor nsfw info
     descSection = makeDesc $ descFor nsfw info
-    tagsList    = makeTags $ tagsFor nsfw info
+    tagsList    = makeTags undir $ tagsFor nsfw info
     linksList   = extLinks $ linksFor nsfw info
 
     prefetches = map makePrefetch $ tail images
@@ -143,8 +143,8 @@ altButton i (Image {label, path, nsfw, warning}) = [b|@4
   path'          = pageFile path
   warning'       = ifJust warning \w -> [b| data-warning="$*w"|]
 
-makeTags :: [Strict.Text] -> Builder
-makeTags tags =
+makeTags :: FilePath -> [Strict.Text] -> Builder
+makeTags undir tags =
   if null tags then "" else [b|@4
     <nav id=tags class=info-section>
       <h2>tags</h2>
@@ -155,7 +155,8 @@ makeTags tags =
   |]
  where
   tagList = map makeTag tags
-  makeTag t = [b|<li>$*t|]
+  makeTag tag = [b|<li><a href="$@undir#require_$tag'">$*tag</a>|]
+    where tag' = escId tag
 
 extLinks :: [Link] -> Builder
 extLinks links =