diff --git a/src/components/PostList.vue b/src/components/PostList.vue
index 6741e75..1b3cbd3 100644
--- a/src/components/PostList.vue
+++ b/src/components/PostList.vue
@@ -8,6 +8,7 @@
   <button
     v-if="isPageFull()"
     class="btn secondary next-btn"
+    :disabled="isNextPageLoading"
     @click="loadNextPage()"
   >
     Show more posts
@@ -16,6 +17,7 @@
 
 <script setup lang="ts">
 import { watch } from "vue"
+import { $ref } from "vue/macros"
 
 import { PAGE_SIZE } from "@/api/common"
 import { Post as PostObject } from "@/api/posts"
@@ -31,11 +33,13 @@ const emit = defineEmits<{
 }>()
 
 let initialPostCount: number | null = null
+let isNextPageLoading = $ref(false)
 
-watch(() => props.posts.length, (postCount) => {
+watch(() => props.posts, (posts) => {
   if (initialPostCount === null) {
-    initialPostCount = postCount
+    initialPostCount = posts.length
   }
+  isNextPageLoading = false
 })
 
 function onPostDeleted(postId: string) {
@@ -51,6 +55,7 @@ function isPageFull(): boolean {
 function loadNextPage() {
   if (props.posts.length > 0) {
     const maxId = props.posts[props.posts.length - 1].id
+    isNextPageLoading = true
     emit("load-next-page", maxId)
   }
 }
diff --git a/src/views/HomeTimeline.vue b/src/views/HomeTimeline.vue
index 76372ba..a74106f 100644
--- a/src/views/HomeTimeline.vue
+++ b/src/views/HomeTimeline.vue
@@ -38,7 +38,7 @@ function insertPost(post: Post) {
 async function loadNextPage(maxId: string) {
   const authToken = ensureAuthToken()
   const nextPage = await getHomeTimeline(authToken, maxId)
-  posts.push(...nextPage)
+  posts = [...posts, ...nextPage]
 }
 </script>