diff --git a/src/lib/Chat.svelte b/src/lib/Chat.svelte
index 89c975c..418c53e 100644
--- a/src/lib/Chat.svelte
+++ b/src/lib/Chat.svelte
@@ -33,9 +33,7 @@
     faMicrophone,
     faLightbulb,
     faCommentSlash,
-
     faCircleCheck
-
   } from '@fortawesome/free-solid-svg-icons/index'
   import { v4 as uuidv4 } from 'uuid'
   import { getPrice } from './Stats.svelte'
@@ -50,11 +48,6 @@
   const chatId: number = parseInt(params.chatId)
 
   let chatRequest = new ChatRequest()
-
-  // let controller:AbortController
-
-  // let updating: boolean|number = false
-  // let updatingMessage: string = ''
   let input: HTMLTextAreaElement
   let recognition: any = null
   let recording = false
@@ -98,6 +91,12 @@
   
   $: onStateChange($checkStateChange, $showSetChatSettings, $submitExitingPromptsNow, $continueMessage)
 
+  const afterChatLoad = (...args:any) => {
+    scrollToBottom()
+  }
+
+  $: afterChatLoad($currentChatId)
+
   setCurrentChat(0)
   // Make sure chat object is ready to go
   updateChatSettings(chatId)
diff --git a/src/lib/Messages.svelte b/src/lib/Messages.svelte
index 5a6c482..a116103 100644
--- a/src/lib/Messages.svelte
+++ b/src/lib/Messages.svelte
@@ -14,6 +14,6 @@
 
 {#each messages as message, i}
   {#if !((message.summarized) && $globalStorage.hideSummarized) && !(i === 0 && message.role === 'system' && !chatSettings.useSystemPrompt)}
-  <EditMessage bind:message={message} chatId={chatId} chat={chat} />
+  {#key message.uuid}<EditMessage bind:message={message} chatId={chatId} chat={chat} />{/key}
   {/if}
 {/each}