diff --git a/client/src/components/netflix-grid.tsx b/client/src/components/netflix-grid.tsx
index bda81db..bda5228 100644
--- a/client/src/components/netflix-grid.tsx
+++ b/client/src/components/netflix-grid.tsx
@@ -157,20 +157,16 @@ function CategoryRow({ category, onVideoClick }: CategoryRowProps) {
     scroll(direction);
   };
 
-  // Get visible videos based on current index
-  const getVisibleVideos = () => {
+  // Handle infinite scroll reset
+  useEffect(() => {
     const totalVideos = category.videos.length;
-    const visible = [];
-    
-    for (let i = 0; i < videosToShow; i++) {
-      const index = (currentIndex + i) % totalVideos;
-      visible.push({
-        ...category.videos[index],
-        displayIndex: i
-      });
+    if (currentIndex >= totalVideos) {
+      // Reset to beginning for infinite loop
+      setTimeout(() => {
+        setCurrentIndex(0);
+      }, 500); // After animation completes
     }
-    return visible;
-  };
+  }, [currentIndex, category.videos.length]);
 
   // Always show both buttons
   useEffect(() => {
@@ -271,11 +267,16 @@ function CategoryRow({ category, onVideoClick }: CategoryRowProps) {
         </button>
 
         {/* Carousel video row */}
-        <div className="flex space-x-2 md:space-x-3 pb-4 px-4 md:px-0 transition-transform duration-500 ease-in-out">
-          {getVisibleVideos().map((video, index) => {
-            const actualIndex = (currentIndex + index) % category.videos.length;
+        <div 
+          className="flex space-x-2 md:space-x-3 pb-4 px-4 md:px-0 transition-transform duration-500 ease-in-out"
+          style={{
+            transform: `translateX(-${currentIndex * (224 + 12)}px)` // 224px video width + 12px spacing
+          }}
+        >
+          {[...category.videos, ...category.videos].map((video, index) => {
+            const actualIndex = index % category.videos.length;
             return (
-              <div key={`${video.id}-${currentIndex}-${index}`} className="flex-shrink-0 w-28 md:w-52 relative group">
+              <div key={`${video.id}-${index}`} className="flex-shrink-0 w-28 md:w-52 relative group">
                 {/* Top 10 Number overlay for first category */}
                 {category.title.includes("Top 10") && (
                   <div className="absolute top-1 left-1 z-20 text-white font-black text-3xl md:text-5xl drop-shadow-2xl"