diff --git a/src/components/bookings/BookingDetailPanel.tsx b/src/components/bookings/BookingDetailPanel.tsx
index 00e472e..807b818 100644
--- a/src/components/bookings/BookingDetailPanel.tsx
+++ b/src/components/bookings/BookingDetailPanel.tsx
@@ -141,6 +141,9 @@ export function BookingDetailPanel({ booking, room, rooms, allBookings, slug, on
     setShowGuestForm(false)
     setEditingBg(null)
     setBgForm({})
+    setEarlyOutOpen(false)
+    setEarlyOutDate(booking.checkOut.slice(0, 10))
+    setEarlyOpen(false)
   }, [booking.id])
 
   // Debounced guest autocomplete
@@ -288,7 +291,7 @@ export function BookingDetailPanel({ booking, room, rooms, allBookings, slug, on
   const [earlySaving, setEarlySaving]       = useState(false)
 
   const [earlyOutOpen, setEarlyOutOpen]         = useState(false)
-  const [earlyOutDate, setEarlyOutDate]         = useState(today)
+  const [earlyOutDate, setEarlyOutDate]         = useState(checkOutDate)
   const [earlyOutMethod, setEarlyOutMethod]     = useState<'cash' | 'card' | 'transfer'>('cash')
   const [earlyOutSaving, setEarlyOutSaving]     = useState(false)
 
@@ -1353,7 +1356,7 @@ export function BookingDetailPanel({ booking, room, rooms, allBookings, slug, on
                       }])
                     }
                     setEarlyOutOpen(true)
-                    setEarlyOutDate(today)
+                    setEarlyOutDate(checkOutDate)
                   }}
                   className="w-full btn-primary justify-center bg-emerald-600 hover:bg-emerald-700"
                 >