diff --git a/frontend/src/components/artist/ArtistPostsTab.vue b/frontend/src/components/artist/ArtistPostsTab.vue
index d628f62..1a5fbc6 100644
--- a/frontend/src/components/artist/ArtistPostsTab.vue
+++ b/frontend/src/components/artist/ArtistPostsTab.vue
@@ -28,10 +28,11 @@
 </template>
 
 <script setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { RouterLink } from 'vue-router'
 
 import { usePostsStore } from '../../stores/posts.js'
+import { useInfiniteScroll } from '../../composables/useInfiniteScroll.js'
 import PostCard from '../posts/PostCard.vue'
 
 const props = defineProps({
@@ -42,7 +43,6 @@ defineEmits(['switch-tab'])
 
 const store = usePostsStore()
 const sentinel = ref(null)
-let observer = null
 
 async function reload () {
   await store.loadInitial({ artist_id: props.artistId, platform: null })
@@ -50,19 +50,9 @@ async function reload () {
 
 watch(() => props.artistId, reload)
 
-onMounted(async () => {
-  await reload()
-  observer = new IntersectionObserver((entries) => {
-    if (entries.some(e => e.isIntersecting)) {
-      store.loadMore()
-    }
-  }, { rootMargin: '400px 0px' })
-  if (sentinel.value) observer.observe(sentinel.value)
-})
+useInfiniteScroll(sentinel, () => store.loadMore(), { rootMargin: '400px 0px' })
 
-onUnmounted(() => {
-  if (observer) observer.disconnect()
-})
+onMounted(reload)
 </script>
 
 <style scoped>
diff --git a/frontend/src/components/discovery/MasonryGrid.vue b/frontend/src/components/discovery/MasonryGrid.vue
index 7375be6..f90a5ce 100644
--- a/frontend/src/components/discovery/MasonryGrid.vue
+++ b/frontend/src/components/discovery/MasonryGrid.vue
@@ -30,8 +30,9 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
+import { ref, computed } from 'vue'
 import { usePolyMasonry } from '../../composables/usePolyMasonry.js'
+import { useInfiniteScroll } from '../../composables/useInfiniteScroll.js'
 
 const props = defineProps({
   items: { type: Array, default: () => [] },
@@ -78,20 +79,9 @@ function aspectStyle(item) {
   return { aspectRatio: `${w} / ${h}` }
 }
 
-let observer = null
-function attachObserver() {
-  if (observer) observer.disconnect()
-  if (!sentinelEl.value) return
-  observer = new IntersectionObserver(([entry]) => {
-    if (entry.isIntersecting && props.hasMore && !props.loading) {
-      emit('load-more')
-    }
-  }, { rootMargin: '600px' })
-  observer.observe(sentinelEl.value)
-}
-watch(sentinelEl, attachObserver)
-onMounted(attachObserver)
-onUnmounted(() => observer && observer.disconnect())
+useInfiniteScroll(sentinelEl, () => {
+  if (props.hasMore && !props.loading) emit('load-more')
+})
 </script>
 
 <style scoped>
diff --git a/frontend/src/components/gallery/GalleryGrid.vue b/frontend/src/components/gallery/GalleryGrid.vue
index 8552c01..29db64f 100644
--- a/frontend/src/components/gallery/GalleryGrid.vue
+++ b/frontend/src/components/gallery/GalleryGrid.vue
@@ -32,8 +32,9 @@
 </template>
 
 <script setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue'
+import { ref } from 'vue'
 import { useGalleryStore } from '../../stores/gallery.js'
+import { useInfiniteScroll } from '../../composables/useInfiniteScroll.js'
 import GalleryItem from './GalleryItem.vue'
 
 defineEmits(['open'])
@@ -41,22 +42,9 @@ defineEmits(['open'])
 const store = useGalleryStore()
 const sentinelEl = ref(null)
 
-let observer = null
-
-function attachObserver() {
-  if (observer) observer.disconnect()
-  if (!sentinelEl.value) return
-  observer = new IntersectionObserver(([entry]) => {
-    if (entry.isIntersecting && store.hasMore && !store.loading) {
-      store.loadMore()
-    }
-  }, { rootMargin: '600px' })
-  observer.observe(sentinelEl.value)
-}
-
-watch(sentinelEl, attachObserver)
-onMounted(() => attachObserver())
-onUnmounted(() => observer && observer.disconnect())
+useInfiniteScroll(sentinelEl, () => {
+  if (store.hasMore && !store.loading) store.loadMore()
+})
 
 function dateHeaderId(group) { return `fc-month-${group.year}-${group.month}` }
 
diff --git a/frontend/src/composables/useInfiniteScroll.js b/frontend/src/composables/useInfiniteScroll.js
new file mode 100644
index 0000000..a1e5c67
--- /dev/null
+++ b/frontend/src/composables/useInfiniteScroll.js
@@ -0,0 +1,28 @@
+import { onMounted, onUnmounted, watch } from 'vue'
+
+// Shared IntersectionObserver-on-a-sentinel infinite-scroll lifecycle.
+// Pass a ref to the sentinel element and a callback to fire when it scrolls
+// into view; the callback owns its own guard (e.g. `if (store.hasMore &&
+// !store.loading) store.loadMore()`). Re-attaches if the sentinel ref
+// changes (e.g. it's behind a v-if) and disconnects on unmount.
+export function useInfiniteScroll (sentinelRef, onIntersect, { rootMargin = '600px' } = {}) {
+  let observer = null
+
+  function teardown () {
+    if (observer) { observer.disconnect(); observer = null }
+  }
+  function attach () {
+    teardown()
+    if (!sentinelRef.value) return
+    observer = new IntersectionObserver(([entry]) => {
+      if (entry.isIntersecting) onIntersect()
+    }, { rootMargin })
+    observer.observe(sentinelRef.value)
+  }
+
+  onMounted(attach)
+  watch(sentinelRef, attach)
+  onUnmounted(teardown)
+
+  return { attach, teardown }
+}
diff --git a/frontend/src/views/ArtistsView.vue b/frontend/src/views/ArtistsView.vue
index ee52b3a..b79ca83 100644
--- a/frontend/src/views/ArtistsView.vue
+++ b/frontend/src/views/ArtistsView.vue
@@ -34,9 +34,10 @@
 </template>
 
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import { useArtistDirectoryStore } from '../stores/artistDirectory.js'
 import { usePlatformsStore } from '../stores/platforms.js'
+import { useInfiniteScroll } from '../composables/useInfiniteScroll.js'
 import ArtistCard from '../components/discovery/ArtistCard.vue'
 
 const store = useArtistDirectoryStore()
@@ -55,16 +56,9 @@ watch(search, (v) => {
 })
 watch(platformModel, (v) => store.setPlatform(v || null))
 
-let observer = null
-function attachObserver() {
-  if (observer) observer.disconnect()
-  if (!sentinelEl.value) return
-  observer = new IntersectionObserver(([e]) => {
-    if (e.isIntersecting && store.hasMore && !store.loading) store.loadMore()
-  }, { rootMargin: '600px' })
-  observer.observe(sentinelEl.value)
-}
-watch(sentinelEl, attachObserver)
+useInfiniteScroll(sentinelEl, () => {
+  if (store.hasMore && !store.loading) store.loadMore()
+})
 
 onMounted(async () => {
   await platformsStore.loadAll()
@@ -72,9 +66,7 @@ onMounted(async () => {
     title: p.key, value: p.key,
   }))
   store.reset()
-  attachObserver()
 })
-onUnmounted(() => observer && observer.disconnect())
 </script>
 
 <style scoped>
diff --git a/frontend/src/views/SeriesManageView.vue b/frontend/src/views/SeriesManageView.vue
index 0674f11..d12ddcc 100644
--- a/frontend/src/views/SeriesManageView.vue
+++ b/frontend/src/views/SeriesManageView.vue
@@ -61,15 +61,15 @@
 </template>
 
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import { useSeriesManageStore, moveItem } from '../stores/seriesManage.js'
+import { useInfiniteScroll } from '../composables/useInfiniteScroll.js'
 
 const route = useRoute()
 const store = useSeriesManageStore()
 const dragFrom = ref(null)
 const sentinel = ref(null)
-let observer = null
 
 function onDrop(toIdx) {
   if (dragFrom.value === null || dragFrom.value === toIdx) return
@@ -80,15 +80,12 @@ function onDrop(toIdx) {
   store.reorder(ordered)
 }
 
+useInfiniteScroll(sentinel, () => store.loadPicker())
+
 onMounted(async () => {
   await store.load(parseInt(route.params.tagId, 10))
   await store.loadPicker(true)
-  observer = new IntersectionObserver(([e]) => {
-    if (e.isIntersecting) store.loadPicker()
-  }, { rootMargin: '600px' })
-  if (sentinel.value) observer.observe(sentinel.value)
 })
-onUnmounted(() => observer && observer.disconnect())
 </script>
 
 <style scoped>
diff --git a/frontend/src/views/TagsView.vue b/frontend/src/views/TagsView.vue
index b79b6f8..a70b27a 100644
--- a/frontend/src/views/TagsView.vue
+++ b/frontend/src/views/TagsView.vue
@@ -89,11 +89,12 @@
 </template>
 
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { useTagDirectoryStore } from '../stores/tagDirectory.js'
 import { useAdminStore } from '../stores/admin.js'
 import { useApi } from '../composables/useApi.js'
+import { useInfiniteScroll } from '../composables/useInfiniteScroll.js'
 import TagCard from '../components/discovery/TagCard.vue'
 import MergeConfirmDialog from '../components/discovery/MergeConfirmDialog.vue'
 import DestructiveConfirmModal from '../components/modal/DestructiveConfirmModal.vue'
@@ -130,18 +131,10 @@ watch(search, (v) => {
 })
 watch(kind, (v) => store.setKind(v || null))
 
-let observer = null
-function attachObserver() {
-  if (observer) observer.disconnect()
-  if (!sentinelEl.value) return
-  observer = new IntersectionObserver(([e]) => {
-    if (e.isIntersecting && store.hasMore && !store.loading) store.loadMore()
-  }, { rootMargin: '600px' })
-  observer.observe(sentinelEl.value)
-}
-watch(sentinelEl, attachObserver)
-onMounted(() => { store.reset(); attachObserver() })
-onUnmounted(() => observer && observer.disconnect())
+useInfiniteScroll(sentinelEl, () => {
+  if (store.hasMore && !store.loading) store.loadMore()
+})
+onMounted(() => store.reset())
 
 function openTag(tagId) {
   router.push({ name: 'gallery', query: { tag_id: tagId } })