diff --git a/templates/browse.gohtml b/templates/browse.gohtml
index 4a2d10b..bb38b52 100644
--- a/templates/browse.gohtml
+++ b/templates/browse.gohtml
@@ -20,19 +20,11 @@
       </div>
     {{else}}
       <div id="anime-grid" class="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-6">
-        {{range $i, $anime := .Animes}}
-          {{$isThreshold := eq (add $i 1) (sub (len $.Animes) 8)}}
-          {{if and $isThreshold $.HasNextPage}}
-            <div hx-get="/browse?q={{$.Query}}&type={{$.Type}}&status={{$.Status}}&order_by={{$.OrderBy}}&sort={{$.Sort}}&sfw={{$.SFW}}&{{genresParams $.Genres}}&page={{$.NextPage}}"
-                 hx-trigger="revealed"
-                 hx-swap="afterend"
-                 hx-target="this"
-                 class="contents">
-              {{template "anime_card" dict "Anime" . "WithActions" true "IsWatchlist" (index $.WatchlistMap .MalID)}}
-            </div>
-          {{else}}
-            {{template "anime_card" dict "Anime" . "WithActions" true "IsWatchlist" (index $.WatchlistMap .MalID)}}
-          {{end}}
+        {{range .Animes}}
+          {{template "anime_card" dict "Anime" . "WithActions" true "IsWatchlist" (index $.WatchlistMap .MalID)}}
+        {{end}}
+        {{if .HasNextPage}}
+          {{template "browse_sentinel" .}}
         {{end}}
       </div>
     {{end}}
@@ -41,19 +33,18 @@
 {{end}}
 
 {{define "anime_card_scroll"}}
-  {{$count := len .Animes}}
-  {{range $i, $anime := .Animes}}
-    {{$isThreshold := eq (add $i 1) (sub $count 8)}}
-    {{if and $isThreshold $.HasNextPage}}
-      <div hx-get="/browse?q={{$.Query}}&type={{$.Type}}&status={{$.Status}}&order_by={{$.OrderBy}}&sort={{$.Sort}}&sfw={{$.SFW}}&{{genresParams $.Genres}}&page={{$.NextPage}}"
-           hx-trigger="revealed"
-           hx-swap="afterend"
-           hx-target="this"
-           class="contents">
-        {{template "anime_card" dict "Anime" $anime "WithActions" true "IsWatchlist" (index $.WatchlistMap $anime.MalID)}}
-      </div>
-    {{else}}
-      {{template "anime_card" dict "Anime" $anime "WithActions" true "IsWatchlist" (index $.WatchlistMap $anime.MalID)}}
-    {{end}}
+  {{range .Animes}}
+    {{template "anime_card" dict "Anime" . "WithActions" true "IsWatchlist" (index $.WatchlistMap .MalID)}}
+  {{end}}
+  {{if .HasNextPage}}
+    {{template "browse_sentinel" .}}
   {{end}}
 {{end}}
+
+{{define "browse_sentinel"}}
+  <div hx-get="/browse?q={{.Query}}&type={{.Type}}&status={{.Status}}&order_by={{.OrderBy}}&sort={{.Sort}}&sfw={{.SFW}}&{{genresParams .Genres}}&page={{.NextPage}}"
+       hx-trigger="intersect once"
+       hx-swap="outerHTML"
+       hx-target="this"
+       class="col-span-full h-px"></div>
+{{end}}