diff --git a/nginx/vue/src/components/util/Chat.vue b/nginx/vue/src/components/util/Chat.vue
index f859684..28c9e1b 100644
--- a/nginx/vue/src/components/util/Chat.vue
+++ b/nginx/vue/src/components/util/Chat.vue
@@ -11,21 +11,47 @@ const authStore = useAuthStore();
 const messages = computed(() => messagesStore.messages);
 const messageInput = ref("");
 const messagesContainer = ref(null);
+const messagesInner = ref(null);
 const fileInput = ref(null);
 
+const isNearBottom = ref(true);
+const SCROLL_THRESHOLD = 100;
+let resizeObserver = null;
+
 function scrollToBottom() {
-  nextTick(() => {
-    if (messagesContainer.value) {
-      messagesContainer.value.scrollTop = messagesContainer.value.scrollHeight;
-    }
-  });
+  if (messagesContainer.value) {
+    messagesContainer.value.scrollTop = messagesContainer.value.scrollHeight;
+  }
 }
 
-watch(messages, scrollToBottom, { deep: true });
+function scrollToBottomIfNear() {
+  if (isNearBottom.value) {
+    scrollToBottom();
+  }
+}
+
+function onScroll() {
+  if (!messagesContainer.value) return;
+  const { scrollHeight, scrollTop, clientHeight } = messagesContainer.value;
+  isNearBottom.value = scrollHeight - scrollTop - clientHeight < SCROLL_THRESHOLD;
+}
+
+function goToBottom() {
+  isNearBottom.value = true;
+  scrollToBottom();
+}
+
+watch(
+  () => messages.value.length,
+  () => {
+    nextTick(scrollToBottomIfNear);
+  },
+);
 
 function sendMessage() {
   const text = messageInput.value.trim();
   if (!text) return;
+  isNearBottom.value = true;
   messagesStore.sendMessage(text);
   messageInput.value = "";
 }
@@ -33,6 +59,7 @@ function sendMessage() {
 async function onFileSelected(e) {
   const file = e.target.files[0];
   if (!file) return;
+  isNearBottom.value = true;
   await messagesStore.uploadAndSendFile(file);
   fileInput.value.value = "";
 }
@@ -73,9 +100,30 @@ function parseMessageParts(text) {
 
 onMounted(() => {
   messagesStore.connect();
+
+  if (messagesContainer.value) {
+    messagesContainer.value.addEventListener("scroll", onScroll, { passive: true });
+  }
+
+  if (messagesInner.value) {
+    resizeObserver = new ResizeObserver(scrollToBottomIfNear);
+    resizeObserver.observe(messagesInner.value);
+  }
+
+  scrollToBottom();
 });
+
 onUnmounted(() => {
   messagesStore.disconnect();
+
+  if (messagesContainer.value) {
+    messagesContainer.value.removeEventListener("scroll", onScroll);
+  }
+
+  if (resizeObserver) {
+    resizeObserver.disconnect();
+    resizeObserver = null;
+  }
 });
 </script>
 
@@ -83,41 +131,41 @@ onUnmounted(() => {
   <div class="chat-root flex-col flex min-h-0">
     <Header>Chat</Header>
     <div ref="messagesContainer" class="flex flex-col flex-1 min-h-0 overflow-y-auto overflow-x-hidden p-2 min-w-0">
-      <p v-for="message in messages" :key="message.id" class="break-words min-w-0 w-full">
-        <span class="text-tertiary">{{ message.authorId }}:</span>
-        <template
-          v-for="(part, i) in parseMessageParts(message.text || '')"
-          :key="i"
-        >
-          <Link
-            v-if="part.type === 'link'"
-            bare
-            :href="part.value"
-            target="_blank"
-            class="text-primary underline break-all"
-            >{{ part.value }}</Link
+      <div ref="messagesInner">
+        <p v-for="message in messages" :key="message.id" class="break-words min-w-0 w-full">
+          <span class="text-tertiary">{{ message.authorId }}:</span>
+          <template
+            v-for="(part, i) in parseMessageParts(message.text || '')"
+            :key="i"
           >
-          <span v-else>{{ part.value }}</span>
-        </template>
-        <template v-if="message.fileUrl && isSafeFileUrl(message.fileUrl)">
-          <img
-            v-if="isImageUrl(message.fileUrl)"
-            :src="message.fileUrl"
-            class="w-full max-w-full max-h-48 rounded block"
-            @load="scrollToBottom"
-          />
-          <video
-            v-else-if="isVideoUrl(message.fileUrl)"
-            :src="message.fileUrl"
-            controls
-            class="w-full max-w-full max-h-48 rounded block"
-            @loadedmetadata="scrollToBottom"
-          />
-          <Link v-else bare :href="message.fileUrl" target="_blank" class="underline break-all">{{
-            message.fileUrl.split("/").pop()
-          }}</Link>
-        </template>
-      </p>
+            <Link
+              v-if="part.type === 'link'"
+              bare
+              :href="part.value"
+              target="_blank"
+              class="text-primary underline break-all"
+              >{{ part.value }}</Link
+            >
+            <span v-else>{{ part.value }}</span>
+          </template>
+          <template v-if="message.fileUrl && isSafeFileUrl(message.fileUrl)">
+            <img
+              v-if="isImageUrl(message.fileUrl)"
+              :src="message.fileUrl"
+              class="w-full max-w-full max-h-48 rounded block"
+            />
+            <video
+              v-else-if="isVideoUrl(message.fileUrl)"
+              :src="message.fileUrl"
+              controls
+              class="w-full max-w-full max-h-48 rounded block"
+            />
+            <Link v-else bare :href="message.fileUrl" target="_blank" class="underline break-all">{{
+              message.fileUrl.split("/").pop()
+            }}</Link>
+          </template>
+        </p>
+      </div>
     </div>
     <div>
       <input v-model="messageInput" @keyup.enter="sendMessage" />
@@ -135,7 +183,7 @@ onUnmounted(() => {
           @click="fileInput.click()"
           >Attach</Button
         >
-        <Button class="flex-1" @click="scrollToBottom">Bottom</Button>
+        <Button v-if="!isNearBottom" class="flex-1" @click="goToBottom">Bottom</Button>
       </div>
     </div>
   </div>