diff --git a/client/src/components/netflix-grid.tsx b/client/src/components/netflix-grid.tsx
index e6f45e1..aaa8086 100644
--- a/client/src/components/netflix-grid.tsx
+++ b/client/src/components/netflix-grid.tsx
@@ -179,6 +179,16 @@ function CategoryRow({ category, onVideoClick, hideScrollButtons = false }: Cate
   const [isScrolling, setIsScrolling] = useState(false);
   const scrollIntervalRef = useRef<NodeJS.Timeout>();
   const [clickedVideoId, setClickedVideoId] = useState<string | null>(null);
+  const [canScrollLeft, setCanScrollLeft] = useState(false);
+  const [canScrollRight, setCanScrollRight] = useState(true);
+
+  const checkScrollButtons = () => {
+    if (scrollRef.current) {
+      const { scrollLeft, scrollWidth, clientWidth } = scrollRef.current;
+      setCanScrollLeft(scrollLeft > 0);
+      setCanScrollRight(scrollLeft < scrollWidth - clientWidth - 1);
+    }
+  };
 
   const scroll = (direction: 'left' | 'right') => {
     if (scrollRef.current) {
@@ -195,6 +205,9 @@ function CategoryRow({ category, onVideoClick, hideScrollButtons = false }: Cate
         left: targetScroll,
         behavior: 'smooth'
       });
+      
+      // Check scroll buttons after animation completes
+      setTimeout(checkScrollButtons, 300);
     }
   };
 
@@ -221,12 +234,18 @@ function CategoryRow({ category, onVideoClick, hideScrollButtons = false }: Cate
   };
 
   useEffect(() => {
+    checkScrollButtons();
+    
     return () => {
       if (scrollIntervalRef.current) {
         clearInterval(scrollIntervalRef.current);
       }
     };
-  }, []);
+  }, [category.videos]);
+
+  const handleScroll = () => {
+    checkScrollButtons();
+  };
 
   return (
     <div 
@@ -238,12 +257,12 @@ function CategoryRow({ category, onVideoClick, hideScrollButtons = false }: Cate
       </h2>
       <div className="relative overflow-hidden">
         {/* Left scroll button - small circular on videos */}
-        {!hideScrollButtons && (
+        {!hideScrollButtons && canScrollLeft && (
           <Button
             onClick={() => scroll('left')}
             onMouseEnter={() => startAutoScroll('left')}
             onMouseLeave={stopAutoScroll}
-            className="absolute left-2 top-1/2 -translate-y-1/2 z-[60] bg-gradient-to-r from-purple-600 to-blue-500 hover:from-purple-700 hover:to-blue-600 text-white border-none w-8 h-8 rounded-full transition-all duration-300 hidden md:flex items-center justify-center shadow-xl"
+            className="absolute left-2 top-1/2 -translate-y-1/2 z-[60] bg-gradient-to-r from-purple-600 to-blue-500 hover:from-purple-700 hover:to-blue-600 text-white border-none w-8 h-8 rounded-full transition-all duration-300 hidden md:flex items-center justify-center shadow-xl opacity-75"
             size="sm"
           >
             <ChevronLeft className="w-4 h-4" />
@@ -251,12 +270,12 @@ function CategoryRow({ category, onVideoClick, hideScrollButtons = false }: Cate
         )}
 
         {/* Right scroll button - small circular on videos */}
-        {!hideScrollButtons && (
+        {!hideScrollButtons && canScrollRight && (
           <Button
             onClick={() => scroll('right')}
             onMouseEnter={() => startAutoScroll('right')}
             onMouseLeave={stopAutoScroll}
-            className="absolute right-2 top-1/2 -translate-y-1/2 z-[60] bg-gradient-to-r from-purple-600 to-blue-500 hover:from-purple-700 hover:to-blue-600 text-white border-none w-8 h-8 rounded-full transition-all duration-300 hidden md:flex items-center justify-center shadow-xl"
+            className="absolute right-2 top-1/2 -translate-y-1/2 z-[60] bg-gradient-to-r from-purple-600 to-blue-500 hover:from-purple-700 hover:to-blue-600 text-white border-none w-8 h-8 rounded-full transition-all duration-300 hidden md:flex items-center justify-center shadow-xl opacity-75"
             size="sm"
           >
             <ChevronRight className="w-4 h-4" />
@@ -268,6 +287,7 @@ function CategoryRow({ category, onVideoClick, hideScrollButtons = false }: Cate
           ref={scrollRef}
           className="flex gap-3 overflow-x-auto scrollbar-hide py-4 px-2"
           style={{ scrollbarWidth: 'none', msOverflowStyle: 'none' }}
+          onScroll={handleScroll}
         >
           {category.videos.map((video, index) => (
             <div