diff --git a/templates/gallery.html b/templates/gallery.html
index 16c8139..ee648cf 100644
--- a/templates/gallery.html
+++ b/templates/gallery.html
@@ -286,8 +286,17 @@
 
         function nextImage() {
             const images = getGalleryImages();
-            currentIndex = (currentIndex + 1) % images.length;
-            showImageAndLoadDetails(currentIndex);
+            if (currentIndex + 1 >= images.length && loadedCount < allImages.length) {
+                loadNextBatch();
+                // Wait briefly to ensure DOM updates
+                setTimeout(() => {
+                    currentIndex++;
+                    showImageAndLoadDetails(currentIndex);
+                }, 100);
+            } else {
+                currentIndex = (currentIndex + 1) % images.length;
+                showImageAndLoadDetails(currentIndex);
+            }
         }
 
         function prevImage() {
@@ -296,6 +305,7 @@
             showImageAndLoadDetails(currentIndex);
         }
 
+
         function closeLightbox() {
             document.getElementById("lightbox").style.display = "none";
         }