diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index e4c40f4a9..9855c01cd 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -322,7 +322,8 @@ export default {
     const diveToTopLevel = () => scrollTo(new Set([currentAncestors.value[0].id]))
 
     watch(focusedId, async (neu, old) => {
-      if (neu) scrollTo(new Set([neu]))
+      // Ignoring initial update (null -> id) since that is handled by scroll compensation
+      if (old && neu) scrollTo(new Set([neu]))
     })
 
     return {
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 77a160672..3dd50ba7c 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -84,7 +84,7 @@ const Timeline = {
     const offset = computed(() => {
       if (embedded.value) {
       // The fontsize after navbar is the little gap between navbar and content
-        return navbarSize.value + fontsize.value
+        return navbarSize.value + fontSize.value
       } else {
         return 0
       }