diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte
index a1be2be8..4db232f9 100644
--- a/src/lib/components/lemmy/comment/Comments.svelte
+++ b/src/lib/components/lemmy/comment/Comments.svelte
@@ -16,6 +16,7 @@
   import { toast } from 'mono-svelte'
   import { profile } from '$lib/auth.js'
   import { Button } from 'mono-svelte'
+  import { afterNavigate } from '$app/navigation'
 
   export let nodes: CommentNodeI[]
   export let isParent: boolean
@@ -25,6 +26,8 @@
 
   onMount(() => {
     hydrated = true
+  })
+  afterNavigate(() => {
     if (isParent && $page.url.hash) {
       document.getElementById($page.url.hash)?.scrollIntoView({
         behavior: 'smooth',
diff --git a/src/routes/comment/[instance]/[id]/+page.ts b/src/routes/comment/[instance]/[id]/+page.ts
index 29b69d62..5d49649b 100644
--- a/src/routes/comment/[instance]/[id]/+page.ts
+++ b/src/routes/comment/[instance]/[id]/+page.ts
@@ -10,6 +10,6 @@ export async function load({ params, fetch }) {
 
   redirect(
     302,
-        `/post/${params.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}`
-      );
+      `/post/${params.instance}/${comment.comment_view.post.id}?thread=${comment.comment_view.comment.path}#${comment.comment_view.comment.id}`
+    );
 }
diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte
index fdd82896..cdd86779 100644
--- a/src/routes/post/[instance]/[id=integer]/+page.svelte
+++ b/src/routes/post/[instance]/[id=integer]/+page.svelte
@@ -119,7 +119,7 @@
       max_depth: data.post.post_view.counts.comments > 100 ? 1 : 3,
     })
     loading = false
-    data.singleThread = false
+    data.thread.singleThread = false
     commentsPage = 1
   }
 
@@ -235,7 +235,27 @@
     </Expandable>
   {/if}
 </div>
-{#if data.singleThread}
+{#if data.thread.showContext}
+  <Material
+    elevation="max"
+    padding="none"
+    color="distinct"
+    class="py-2 px-4 text-sm flex flex-row justify-between items-center
+flex-wrap gap-4 sticky top-20 w-full box-border z-20 mt-4"
+  >
+    <p class="font-medium text-sm flex items-center gap-2">
+      <Icon src={InformationCircle} mini size="20" />
+      You're viewing part of a thread.
+    </p>
+    <Button
+      {loading}
+      disabled={loading}
+      href="/comment/{$page.params.instance}/{data.thread.showContext}"
+    >
+      Show Context
+    </Button>
+  </Material>
+{:else if data.thread.singleThread}
   <Material
     elevation="max"
     padding="none"
diff --git a/src/routes/post/[instance]/[id=integer]/+page.ts b/src/routes/post/[instance]/[id=integer]/+page.ts
index 029ecd8f..a572f28f 100644
--- a/src/routes/post/[instance]/[id=integer]/+page.ts
+++ b/src/routes/post/[instance]/[id=integer]/+page.ts
@@ -15,9 +15,17 @@ export async function load({ params, url, fetch }) {
 
   const thread = url.searchParams.get('thread')
   let parentId: number | undefined
+  let showContext: string | undefined = undefined
 
   if (thread) {
-    parentId = Number(thread.split('.')[1])
+    const split = thread.split('.')
+    if (split.length >= 9) {
+      const sliced = split.slice(0, split.length - 4)
+      showContext = sliced[sliced.length - 1]
+      parentId = Number(split[split.length - 5])
+    } else {
+      parentId = Number(split[1])
+    }
 
     if (!Number.isInteger(parentId)) {
       parentId = undefined
@@ -42,10 +50,13 @@ export async function load({ params, url, fetch }) {
   }
 
   return {
-    singleThread: parentId != undefined,
+    thread: {
+      showContext: showContext,
+      singleThread: parentId != undefined
+    },
     post: post,
     commentSort: sort,
-      comments: await getClient(params.instance, fetch).getComments(commentParams),
+    comments: await getClient(params.instance, fetch).getComments(commentParams),
     slots: {
       sidebar: {
         component: CommunityCard,