diff --git a/src/pages/Genres.tsx b/src/pages/Genres.tsx
index cd153c20..bb058229 100644
--- a/src/pages/Genres.tsx
+++ b/src/pages/Genres.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import {
@@ -45,23 +45,52 @@ function genreColor(name: string): string {
 }
 
 const SCROLL_KEY = 'genres-scroll';
+const VISIBLE_KEY = 'genres-visible';
+const PAGE_SIZE = 60;
 
 export default function Genres() {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const [genres, setGenres] = useState<SubsonicGenre[]>([]);
+  const [rawGenres, setRawGenres] = useState<SubsonicGenre[]>([]);
   const [loading, setLoading] = useState(true);
+  const [visibleCount, setVisibleCount] = useState(() => {
+    // Restore the previous visibleCount when navigating back from a detail
+    // page so scroll position lines up with rendered cards.
+    const saved = sessionStorage.getItem(VISIBLE_KEY);
+    return saved ? Math.max(PAGE_SIZE, parseInt(saved, 10)) : PAGE_SIZE;
+  });
   const containerRef = useRef<HTMLDivElement>(null);
+  const observerTarget = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     getGenres()
-      .then(data => {
-        const sorted = [...data].sort((a, b) => b.albumCount - a.albumCount);
-        setGenres(sorted);
-      })
+      .then(data => setRawGenres(data))
       .finally(() => setLoading(false));
   }, []); // getGenres is not folder-scoped — no dep on musicLibraryFilterVersion
 
+  // Memoised sort — without this the page re-sorted 500+ entries on every
+  // unrelated re-render (e.g. theme change, sidebar toggle).
+  const genres = useMemo(
+    () => [...rawGenres].sort((a, b) => b.albumCount - a.albumCount),
+    [rawGenres],
+  );
+
+  const visible = useMemo(() => genres.slice(0, visibleCount), [genres, visibleCount]);
+  const hasMore = visibleCount < genres.length;
+
+  // Infinite scroll — render the next batch when the user is ~1.5 screens
+  // away from the sentinel, so the rest of the watermarks never block first
+  // paint of the page.
+  useEffect(() => {
+    if (!hasMore) return;
+    const observer = new IntersectionObserver(
+      entries => { if (entries[0].isIntersecting) setVisibleCount(c => c + PAGE_SIZE); },
+      { rootMargin: '1500px' },
+    );
+    if (observerTarget.current) observer.observe(observerTarget.current);
+    return () => observer.disconnect();
+  }, [hasMore]);
+
   // Restore scroll position after genres are rendered
   useEffect(() => {
     if (loading || genres.length === 0) return;
@@ -69,6 +98,7 @@ export default function Genres() {
     if (!saved) return;
     const pos = parseInt(saved, 10);
     sessionStorage.removeItem(SCROLL_KEY);
+    sessionStorage.removeItem(VISIBLE_KEY);
     requestAnimationFrame(() => {
       if (containerRef.current) containerRef.current.scrollTop = pos;
     });
@@ -77,6 +107,7 @@ export default function Genres() {
   const handleGenreClick = (genreValue: string) => {
     if (containerRef.current) {
       sessionStorage.setItem(SCROLL_KEY, String(containerRef.current.scrollTop));
+      sessionStorage.setItem(VISIBLE_KEY, String(visibleCount));
     }
     navigate(`/genres/${encodeURIComponent(genreValue)}`);
   };
@@ -96,33 +127,36 @@ export default function Genres() {
       {loading && <p className="loading-text">{t('genres.loading')}</p>}
       {!loading && genres.length === 0 && <p className="loading-text">{t('genres.empty')}</p>}
 
-      {!loading && genres.length > 0 && (
-        <div className="album-grid-wrap">
-          {genres.map(genre => {
-            const Icon = getGenreIcon(genre.value);
-            const color = genreColor(genre.value);
-            return (
-              <div
-                key={genre.value}
-                className="genre-card"
-                style={{ '--genre-color': color } as React.CSSProperties}
-                onClick={() => handleGenreClick(genre.value)}
-                role="button"
-                tabIndex={0}
-                onKeyDown={e => e.key === 'Enter' && handleGenreClick(genre.value)}
-                data-tooltip={genre.value}
-              >
-                <div className="genre-card-watermark">
-                  <Icon size={80} strokeWidth={1.2} />
+      {!loading && visible.length > 0 && (
+        <>
+          <div className="album-grid-wrap">
+            {visible.map(genre => {
+              const Icon = getGenreIcon(genre.value);
+              const color = genreColor(genre.value);
+              return (
+                <div
+                  key={genre.value}
+                  className="genre-card"
+                  style={{ '--genre-color': color } as React.CSSProperties}
+                  onClick={() => handleGenreClick(genre.value)}
+                  role="button"
+                  tabIndex={0}
+                  onKeyDown={e => e.key === 'Enter' && handleGenreClick(genre.value)}
+                  data-tooltip={genre.value}
+                >
+                  <div className="genre-card-watermark">
+                    <Icon size={80} strokeWidth={1.2} />
+                  </div>
+                  <p className="genre-card-name">{genre.value}</p>
+                  <p className="genre-card-count">
+                    {t('genres.albumCount', { count: genre.albumCount })}
+                  </p>
                 </div>
-                <p className="genre-card-name">{genre.value}</p>
-                <p className="genre-card-count">
-                  {t('genres.albumCount', { count: genre.albumCount })}
-                </p>
-              </div>
-            );
-          })}
-        </div>
+              );
+            })}
+          </div>
+          {hasMore && <div ref={observerTarget} style={{ height: 1 }} />}
+        </>
       )}
     </div>
   );