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 9f270667bc..7414a41d91 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
@@ -840,7 +840,12 @@ fun ClickableNote(
             .combinedClickable(
                 onClick = {
                     scope.launch {
-                        routeFor(baseNote, accountViewModel.userProfile())?.let {
+                        val redirectToNote = if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) {
+                            baseNote.replyTo?.lastOrNull() ?: baseNote
+                        } else {
+                            baseNote
+                        }
+                        routeFor(redirectToNote, accountViewModel.userProfile())?.let {
                             nav(it)
                         }
                     }