diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsx
index dda58035..bc12a142 100644
--- a/src/components/video-editor/SettingsPanel.tsx
+++ b/src/components/video-editor/SettingsPanel.tsx
@@ -211,7 +211,8 @@ export function SettingsPanel({
   
   const [selectedColor, setSelectedColor] = useState('#ADADAD');
   const [gradient, setGradient] = useState<string>(GRADIENTS[0]);
-  const [showCropDropdown, setShowCropDropdown] = useState(false);
+  const [showCropModal, setShowCropModal] = useState(false);
+  const cropSnapshotRef = useRef<CropRegion | null>(null);
 
   const zoomEnabled = Boolean(selectedZoomDepth);
   const trimEnabled = Boolean(selectedTrimId);
@@ -228,6 +229,20 @@ export function SettingsPanel({
     }
   };
 
+  const handleCropToggle = () => {
+    if (!showCropModal && cropRegion) {
+      cropSnapshotRef.current = { ...cropRegion };
+    }
+    setShowCropModal(!showCropModal);
+  };
+
+  const handleCropCancel = () => {
+    if (cropSnapshotRef.current && onCropChange) {
+      onCropChange(cropSnapshotRef.current);
+    }
+    setShowCropModal(false);
+  };
+
   const handleImageUpload = (event: React.ChangeEvent<HTMLInputElement>) => {
     const files = event.target.files;
     if (!files || files.length === 0) return;
@@ -588,7 +603,7 @@ export function SettingsPanel({
               </div>
 
               <Button
-                onClick={() => setShowCropDropdown(!showCropDropdown)}
+                onClick={handleCropToggle}
                 variant="outline"
                 className="w-full mt-2 gap-1.5 bg-white/5 text-slate-200 border-white/10 hover:bg-white/10 hover:border-white/20 hover:text-white text-[10px] h-8 transition-all"
               >
@@ -735,11 +750,11 @@ export function SettingsPanel({
         </Accordion>
       </div>
 
-      {showCropDropdown && cropRegion && onCropChange && (
+      {showCropModal && cropRegion && onCropChange && (
         <>
           <div 
             className="fixed inset-0 bg-black/80 backdrop-blur-sm z-50 animate-in fade-in duration-200"
-            onClick={() => setShowCropDropdown(false)}
+            onClick={handleCropCancel}
           />
           <div className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-[60] bg-[#09090b] rounded-2xl shadow-2xl border border-white/10 p-8 w-[90vw] max-w-5xl max-h-[90vh] overflow-auto animate-in zoom-in-95 duration-200">
             <div className="flex items-center justify-between mb-6">
@@ -750,7 +765,7 @@ export function SettingsPanel({
               <Button
                 variant="ghost"
                 size="icon"
-                onClick={() => setShowCropDropdown(false)}
+                onClick={handleCropCancel}
                 className="hover:bg-white/10 text-slate-400 hover:text-white"
               >
                 <X className="w-5 h-5" />
@@ -764,7 +779,7 @@ export function SettingsPanel({
             />
             <div className="mt-6 flex justify-end">
               <Button
-                onClick={() => setShowCropDropdown(false)}
+                onClick={() => setShowCropModal(false)}
                 size="lg"
                 className="bg-[#2563EB] hover:bg-[#2563EB]/90 text-white"
               >