diff --git a/client/src/pages/VideoPage.tsx b/client/src/pages/VideoPage.tsx
index 33badbb..481b1cd 100644
--- a/client/src/pages/VideoPage.tsx
+++ b/client/src/pages/VideoPage.tsx
@@ -31,7 +31,7 @@ const formatDate = (date: Date | string): string => {
   });
 };
 import { Button } from "@/components/ui/button";
-import { Share2, X, Edit3, Menu, Search, ChevronLeft, ChevronRight } from "lucide-react";
+import { Share2, X, Edit3, Menu, Search, ChevronLeft, ChevronRight, Play, Pause } from "lucide-react";
 import { Input } from "@/components/ui/input";
 import { Link } from "wouter";
 import { apiRequest } from "@/lib/queryClient";
@@ -61,6 +61,8 @@ export default function VideoPage() {
   const [searchQuery, setSearchQuery] = useState("");
   const [viewMode, setViewMode] = useState<"grid" | "list">("grid");
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
+  const [autoplayEnabled, setAutoplayEnabled] = useState(true);
+  const [autoplayTimer, setAutoplayTimer] = useState<NodeJS.Timeout | null>(null);
 
   // Fetch current video
   const { data: currentVideo, isLoading: videoLoading, error: videoError } = useQuery<Video>({
@@ -138,6 +140,12 @@ export default function VideoPage() {
     const currentIndex = getCurrentVideoIndex();
     if (currentIndex === -1) return;
     
+    // Clear any existing autoplay timer
+    if (autoplayTimer) {
+      clearTimeout(autoplayTimer);
+      setAutoplayTimer(null);
+    }
+    
     // Show direction feedback on dots
     setActiveDot(direction === 'next' ? 'right' : 'left');
     
@@ -160,6 +168,29 @@ export default function VideoPage() {
       setLocation(`/video/${shortId}`);
     }
   };
+
+  // Auto-advance to next video after a certain duration
+  const startAutoplayTimer = () => {
+    if (!autoplayEnabled || allVideos.length <= 1) return;
+    
+    // Clear existing timer
+    if (autoplayTimer) {
+      clearTimeout(autoplayTimer);
+    }
+    
+    // Estimate video duration or use default (most videos are 3-5 minutes)
+    const estimatedDuration = currentVideo?.duration || 240000; // 4 minutes default
+    const autoplayDelay = Math.max(estimatedDuration * 0.9, 180000); // 90% of video or min 3 minutes
+    
+    console.log(`🎬 Autoplay timer set for ${Math.round(autoplayDelay / 1000)}s`);
+    
+    const timer = setTimeout(() => {
+      console.log('🚀 Auto-advancing to next video...');
+      navigateToVideo('next');
+    }, autoplayDelay);
+    
+    setAutoplayTimer(timer);
+  };
   
   
   // Update page meta tags for social sharing
@@ -268,12 +299,44 @@ export default function VideoPage() {
         // Use short ID for view tracking
         const shortId = currentVideo.id.replace(/-/g, '').substring(0, 8);
         await apiRequest("POST", `/api/videos/${shortId}/view`);
+        
+        // Start autoplay timer when video starts playing
+        if (autoplayEnabled) {
+          startAutoplayTimer();
+        }
       } catch (error) {
         console.error("Failed to track video view:", error);
       }
     }
   };
 
+  // Initialize autoplay when video changes
+  useEffect(() => {
+    if (currentVideo && autoplayEnabled && allVideos.length > 1) {
+      // Delay the autoplay timer start to ensure iframe is loaded
+      setTimeout(() => {
+        startAutoplayTimer();
+      }, 2000); // 2 second delay for iframe loading
+    }
+    
+    return () => {
+      // Cleanup timer when component unmounts or video changes
+      if (autoplayTimer) {
+        clearTimeout(autoplayTimer);
+        setAutoplayTimer(null);
+      }
+    };
+  }, [currentVideo?.id, autoplayEnabled]);
+
+  // Cleanup timer on component unmount
+  useEffect(() => {
+    return () => {
+      if (autoplayTimer) {
+        clearTimeout(autoplayTimer);
+      }
+    };
+  }, []);
+
   const getShareUrl = () => {
     if (!currentVideo?.id) return window.location.origin;
     // Use custom domain if set, otherwise current domain
@@ -669,17 +732,45 @@ export default function VideoPage() {
                   {currentVideo.title}
                 </h1>
                 
-                <div className="relative">
+                <div className="flex gap-2">
+                  {/* Autoplay toggle button */}
                   <Button
                     variant="ghost"
                     size="sm"
-                    onClick={() => setShowShareMenu(!showShareMenu)}
-                    className="text-white hover:bg-gray-700"
+                    onClick={() => {
+                      setAutoplayEnabled(!autoplayEnabled);
+                      if (!autoplayEnabled && autoplayTimer) {
+                        clearTimeout(autoplayTimer);
+                        setAutoplayTimer(null);
+                      }
+                    }}
+                    className={`text-white hover:bg-gray-700 ${autoplayEnabled ? 'bg-purple-600/30' : ''}`}
+                    title={autoplayEnabled ? 'Autoplay ON - will advance to next video' : 'Autoplay OFF'}
                   >
-                    <Share2 className="w-4 h-4 mr-2" />
-                    Share
+                    {autoplayEnabled ? (
+                      <>
+                        <Play className="w-4 h-4 mr-2" />
+                        Auto
+                      </>
+                    ) : (
+                      <>
+                        <Pause className="w-4 h-4 mr-2" />
+                        Manual
+                      </>
+                    )}
                   </Button>
                   
+                  <div className="relative">
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      onClick={() => setShowShareMenu(!showShareMenu)}
+                      className="text-white hover:bg-gray-700"
+                    >
+                      <Share2 className="w-4 h-4 mr-2" />
+                      Share
+                    </Button>
+                  
                   {showShareMenu && (
                     <div className="absolute right-0 top-full mt-2 bg-gray-800 rounded-lg shadow-lg py-2 z-50 min-w-[200px]">
                       <FacebookShareButton url={getShareUrl()}>
@@ -709,6 +800,7 @@ export default function VideoPage() {
                     </div>
                   )}
                 </div>
+                </div>
               </div>
 
               <div className="flex flex-wrap gap-4 text-sm text-bunny-muted mb-4">