diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte
index 372c58a4c..26e84db8a 100644
--- a/src/app/components/Chat.svelte
+++ b/src/app/components/Chat.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
   import {onMount} from "svelte"
+  import {goto} from "$app/navigation"
   import {
     ago,
     int,
@@ -73,7 +74,7 @@
       ? pushModal(ProfileDetail, {pubkey: others[0]})
       : pushModal(ChatMembers, {pubkeys: others})
 
-  const back = () => history.back()
+  const back = () => goto("/chat")
 
   const replyTo = (event: TrustedEvent) => {
     parent = event
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
index f6f2cdf51..5105ddfdd 100644
--- a/src/app/core/state.ts
+++ b/src/app/core/state.ts
@@ -546,8 +546,11 @@ export const chatsById = call(() => {
 
     const unsubscribers = [
       on(repository, "update", ({added, removed}: RepositoryUpdate) => {
-        addEvents(added)
-        removeEvents(removed)
+        // Do this async so that profiles are populated
+        setTimeout(() => {
+          addEvents(added)
+          removeEvents(removed)
+        }, 50)
       }),
     ]