diff --git a/src/sass/tweet/_base.scss b/src/sass/tweet/_base.scss
index ac623ff..a1320fd 100644
--- a/src/sass/tweet/_base.scss
+++ b/src/sass/tweet/_base.scss
@@ -118,6 +118,7 @@
 
 .show-thread {
     display: block;
+    pointer-events: all;
 }
 
 .unavailable-box {
diff --git a/src/views/timeline.nim b/src/views/timeline.nim
index 034fadb..a0d125a 100644
--- a/src/views/timeline.nim
+++ b/src/views/timeline.nim
@@ -35,8 +35,9 @@ proc renderNoneFound(): VNode =
 proc renderThread(thread: seq[Tweet]; prefs: Prefs; path: string): VNode =
   buildHtml(tdiv(class="thread-line")):
     for i, threadTweet in thread.sortedByIt(it.time):
+      let show = i == thread.len and thread[0].id != threadTweet.threadId
       renderTweet(threadTweet, prefs, path, class="thread",
-                  index=i, total=thread.high)
+                  index=i, total=thread.high, showThread=show)
 
 proc threadFilter(it: Tweet; tweetThread: string): bool =
   it.retweet.isNone and it.reply.len == 0 and it.threadId == tweetThread
@@ -83,7 +84,7 @@ proc renderTimelineTweets*(results: Result[Tweet]; prefs: Prefs; path: string):
         if tweet.threadId in threads: continue
         let thread = results.content.filterIt(threadFilter(it, tweet.threadId))
         if thread.len < 2:
-          renderTweet(tweet, prefs, path)
+          renderTweet(tweet, prefs, path, showThread=tweet.hasThread)
         else:
           renderThread(thread, prefs, path)
           threads &= tweet.threadId
diff --git a/src/views/tweet.nim b/src/views/tweet.nim
index 523dafa..ff30e7b 100644
--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -222,7 +222,7 @@ proc renderQuote(quote: Quote; prefs: Prefs): VNode =
         text "Show this thread"
 
 proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class="";
-                  index=0; total=(-1); last=false): VNode =
+                  index=0; total=(-1); last=false; showThread=false): VNode =
   var divClass = class
   if index == total or last:
     divClass = "thread-last " & class
@@ -265,6 +265,6 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; path: string; class="";
       if not prefs.hideTweetStats:
         renderStats(tweet.stats, views)
 
-      if tweet.hasThread and "timeline" in class:
+      if showThread:
         a(class="show-thread", href=getLink(tweet)):
           text "Show this thread"