diff --git a/.all-contributorsrc b/.all-contributorsrc
index 7aee389..4fd7e0a 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -123,7 +123,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/40603805?v=4",
       "profile": "https://github.com/shivan2418",
       "contributions": [
-        "ideas"
+        "ideas",
+        "design"
       ]
     }
   ],
diff --git a/README.md b/README.md
index 7b6f60c..c209568 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ You can also use ChatGPT-web as a desktop app. To do so, [install Rust first](ht
       <td align="center" valign="top" width="14.28%"><a href="http://terryoy.github.io/"><img src="https://avatars.githubusercontent.com/u/1171589?v=4?s=100" width="100px;" alt="terryoy"/><br /><sub><b>terryoy</b></sub></a><br /><a href="#ideas-terryoy" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/Niek/chatgpt-web/commits?author=terryoy" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/yang-lyu-902/"><img src="https://avatars.githubusercontent.com/u/15838074?v=4?s=100" width="100px;" alt="Yang Lyu"/><br /><sub><b>Yang Lyu</b></sub></a><br /><a href="https://github.com/Niek/chatgpt-web/issues?q=author%3Ayanglyu902" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ryanhex53"><img src="https://avatars.githubusercontent.com/u/360426?v=4?s=100" width="100px;" alt="ryanhex53"/><br /><sub><b>ryanhex53</b></sub></a><br /><a href="https://github.com/Niek/chatgpt-web/commits?author=ryanhex53" title="Code">💻</a> <a href="#design-ryanhex53" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shivan2418"><img src="https://avatars.githubusercontent.com/u/40603805?v=4?s=100" width="100px;" alt="Emil Elgaard"/><br /><sub><b>Emil Elgaard</b></sub></a><br /><a href="#ideas-shivan2418" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shivan2418"><img src="https://avatars.githubusercontent.com/u/40603805?v=4?s=100" width="100px;" alt="Emil Elgaard"/><br /><sub><b>Emil Elgaard</b></sub></a><br /><a href="#ideas-shivan2418" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-shivan2418" title="Design">🎨</a></td>
     </tr>
   </tbody>
 </table>
diff --git a/src/lib/Chat.svelte b/src/lib/Chat.svelte
index e65c50a..dfc5535 100644
--- a/src/lib/Chat.svelte
+++ b/src/lib/Chat.svelte
@@ -162,7 +162,8 @@
   // Scroll to the bottom of the chat on update
   afterUpdate(() => {
     // Scroll to the bottom of the page after any updates to the messages array
-    window.scrollTo(0, document.body.scrollHeight)
+    const chatWindow = document.getElementsByClassName('column is-four-fifths')[0]
+    chatWindow.scrollIntoView({ behavior: 'smooth', block: 'end' })
     input.focus()
   })