diff --git a/app/src/main/kotlin/views/NoteView.kt b/app/src/main/kotlin/views/NoteView.kt
index 5cfb8c7..3c0aa71 100644
--- a/app/src/main/kotlin/views/NoteView.kt
+++ b/app/src/main/kotlin/views/NoteView.kt
@@ -75,7 +75,7 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver
                                 span("space-x-2") {
                                     tags.forEach {
                                         a(href = "?tag=$it", classes = "tag") {
-                                            span { +"#$it" }
+                                            +"#$it"
                                         }
                                     }
                                 }
@@ -108,9 +108,11 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver
         div("container mx-auto p-4") {
             div("flex items-center justify-between mb-4") {
                 h1("text-3xl fond-bold underline") { +note.meta.title }
-                span {
+                span("space-x-2") {
                     note.meta.tags.forEach {
-                        span("tag ml-2") { +"#$it" }
+                        a(href = "/notes?tag=$it", classes = "tag") {
+                            +"#$it"
+                        }
                     }
                 }
             }