diff --git a/components/Lightbox.tsx b/components/Lightbox.tsx
index 6f9f7b63..03480181 100644
--- a/components/Lightbox.tsx
+++ b/components/Lightbox.tsx
@@ -1,7 +1,8 @@
 'use client';
 
-import React, { useEffect } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import Image from 'next/image';
+import { createPortal } from 'react-dom';
 
 interface LightboxProps {
   isOpen: boolean;
@@ -11,32 +12,51 @@ interface LightboxProps {
 }
 
 export default function Lightbox({ isOpen, images, initialIndex, onClose }: LightboxProps) {
-  const [currentIndex, setCurrentIndex] = React.useState(initialIndex);
+  const [currentIndex, setCurrentIndex] = useState(initialIndex);
+  const [mounted, setMounted] = useState(false);
 
   useEffect(() => {
-    if (isOpen) {
-      document.body.style.overflow = 'hidden';
-    } else {
-      document.body.style.overflow = 'unset';
-    }
+    setMounted(true);
+    return () => setMounted(false);
+  }, []);
 
-    return () => {
-      document.body.style.overflow = 'unset';
-    };
-  }, [isOpen]);
-
-  if (!isOpen) return null;
-
-  const prevImage = () => {
+  const prevImage = useCallback(() => {
     setCurrentIndex((prev) => (prev === 0 ? images.length - 1 : prev - 1));
-  };
+  }, [images.length]);
 
-  const nextImage = () => {
+  const nextImage = useCallback(() => {
     setCurrentIndex((prev) => (prev === images.length - 1 ? 0 : prev + 1));
-  };
+  }, [images.length]);
 
-  return (
-    <div className="fixed inset-0 z-[9999] bg-black/90 flex items-center justify-center p-4 animate-in fade-in duration-300">
+  useEffect(() => {
+    if (!isOpen) return;
+
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') onClose();
+      if (e.key === 'ArrowLeft') prevImage();
+      if (e.key === 'ArrowRight') nextImage();
+    };
+
+    // Lock scroll
+    const originalStyle = window.getComputedStyle(document.body).overflow;
+    document.body.style.overflow = 'hidden';
+    
+    window.addEventListener('keydown', handleKeyDown);
+    
+    return () => {
+      document.body.style.overflow = originalStyle;
+      window.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [isOpen, onClose, prevImage, nextImage]);
+
+  if (!isOpen || !mounted) return null;
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-[99999] bg-black/95 backdrop-blur-sm flex items-center justify-center p-4 animate-in fade-in duration-300"
+      role="dialog"
+      aria-modal="true"
+    >
       <button
         onClick={onClose}
         className="absolute top-6 right-6 text-white text-3xl hover:text-[#011dff] transition-colors z-[10000] rounded-full w-12 h-12 flex items-center justify-center hover:bg-white/10"
@@ -74,19 +94,12 @@ export default function Lightbox({ isOpen, images, initialIndex, onClose }: Ligh
         </div>
       </div>
 
-      {/* Keyboard navigation */}
-      {isOpen && (
-        <div
-          className="fixed inset-0 z-[9998]"
-          tabIndex={-1}
-          onKeyDown={(e) => {
-            if (e.key === 'Escape') onClose();
-            if (e.key === 'ArrowLeft') prevImage();
-            if (e.key === 'ArrowRight') nextImage();
-          }}
-          onClick={onClose}
-        />
-      )}
-    </div>
+      {/* Backdrop click to close */}
+      <div
+        className="absolute inset-0 z-[9998]"
+        onClick={onClose}
+      />
+    </div>,
+    document.body
   );
 }
\ No newline at end of file