diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 10f353fe1..429480816 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -314,8 +314,8 @@ export default {
         return linearScrollTo(ids)
       }
     }
-    const diveIntoStatus = (id) => scrollTo(new Set([id]))
-    const diveToTopLevel = () => scrollTo(new Set([currentAncestors.value[0].id]))
+    const diveIntoStatus = (id) => setFocused(id)
+    const diveToTopLevel = () => setFocused(currentAncestors.value[0].id)
 
     watch(focusedId, async (neu, old) => {
       // Ignoring initial update (null -> id) since that is handled by scroll compensation
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index b6fd34ebb..893d84591 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -125,7 +125,7 @@
           </template>
         </div>
         <ThreadTree
-          :status-id="currentStatus.id"
+          :status-id="focusedId ?? currentStatus.id"
           :depth="0"
 
           @goto="setFocused"