diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt
index 37a973073..0cf58ef08 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt
@@ -47,7 +47,7 @@ open class Event(
         if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
-    fun hashtags() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+    override fun hashtags() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
 
     override fun isTaggedUser(idHex: String) = tags.any { it.getOrNull(0) == "p" && it.getOrNull(1) == idHex }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt
index b598066a8..755205848 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt
@@ -28,4 +28,5 @@ interface EventInterface {
     fun isTaggedHash(hashtag: String): Boolean
     fun isTaggedHashes(hashtag: Set<String>): Boolean
     fun firstIsTaggedHashes(hashtag: Set<String>): String?
+    fun hashtags(): List<String>
 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index eb04870a4..1564f0ad1 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -482,6 +482,25 @@ fun NoteCompose(
                                 accountViewModel,
                                 navController
                             )
+
+                            val hashtags = noteEvent.hashtags()
+                            if (hashtags.isNotEmpty()) {
+                                FlowRow() {
+                                    hashtags.forEach {
+                                        if (!eventContent.contains(it, true)) {
+                                            ClickableText(
+                                                text = AnnotatedString("#$it "),
+                                                onClick = { navController.navigate("Hashtag/$it") },
+                                                style = LocalTextStyle.current.copy(
+                                                    color = MaterialTheme.colors.primary.copy(
+                                                        alpha = 0.52f
+                                                    )
+                                                )
+                                            )
+                                        }
+                                    }
+                                }
+                            }
                         }
 
                         if (!makeItShort) {