diff --git a/src/components/Calendar/EventPopover.tsx b/src/components/Calendar/EventPopover.tsx
index 8759ed5b..8eb03383 100644
--- a/src/components/Calendar/EventPopover.tsx
+++ b/src/components/Calendar/EventPopover.tsx
@@ -34,9 +34,7 @@ const ConfirmDeleteEvent: FC<{ event: DisplayCalendarEvent }> = ({ event }) => {
       <DialogContent>
         <DialogHeader>
           <DialogTitle>確認刪除</DialogTitle>
-          <DialogDescription>
-            <p>確定要刪除這個事件嗎？</p>
-          </DialogDescription>
+          <DialogDescription>確定要刪除這個事件嗎?</DialogDescription>
         </DialogHeader>
         <DialogFooter>
           <DialogClose asChild>
@@ -67,7 +65,7 @@ const UpdateRepeatedEventDialog: FC<{
         <DialogHeader>
           <DialogTitle>更新重複事件</DialogTitle>
           <DialogDescription>
-            <p>您要更新所有重複事件還是只更新這個事件？</p>
+            您要更新所有重複事件還是只更新這個事件？
           </DialogDescription>
         </DialogHeader>
         <DialogFooter>
@@ -103,7 +101,7 @@ const DeleteRepeatedEventDialog: FC<{
         <DialogHeader>
           <DialogTitle>刪除重複事件</DialogTitle>
           <DialogDescription>
-            <p>您要刪除所有重複事件還是只刪除這個事件？</p>
+            您要刪除所有重複事件還是只刪除這個事件
           </DialogDescription>
         </DialogHeader>
         <DialogFooter>
diff --git a/src/components/Calendar/UpcomingEvents.tsx b/src/components/Calendar/UpcomingEvents.tsx
index 6ee5f8da..90bdd01a 100644
--- a/src/components/Calendar/UpcomingEvents.tsx
+++ b/src/components/Calendar/UpcomingEvents.tsx
@@ -59,7 +59,7 @@ const UpcomingEvents = () => {
         brightness > 186 ? 0.2 : 0.95,
       );
       return (
-        <EventPopover event={event} key={event.id}>
+        <EventPopover event={event} key={event.id + index}>
           <div
             className="self-stretch px-2 pt-2 pb-6 rounded-md flex-col justify-start items-start gap-2 flex"
             style={{ background: event.color, color: textColor }}
diff --git a/src/components/Calendar/calendar_hook.tsx b/src/components/Calendar/calendar_hook.tsx
index 2117aec7..64f94b2c 100644
--- a/src/components/Calendar/calendar_hook.tsx
+++ b/src/components/Calendar/calendar_hook.tsx
@@ -18,7 +18,10 @@ import useUserTimetable from "@/hooks/contexts/useUserTimetable";
 import { useRxCollection, useRxDB, useRxQuery } from "rxdb-hooks";
 import { getDiffFunction, getActualEndDate } from "./calendar_utils";
 import { subDays } from "date-fns";
-import { serializeEvent } from "@/components/Calendar/calendar_utils";
+import {
+  serializeEvent,
+  getDisplayEndDate,
+} from "@/components/Calendar/calendar_utils";
 import { EventDocType } from "@/config/rxdb";
 import { useAuthState } from "react-firebase-hooks/auth";
 import { auth, firebaseConfig, db as firebaseDb } from "@/config/firebase";
@@ -137,23 +140,23 @@ export const useCalendarProvider = () => {
         case UpdateType.THIS:
           // add this date to excluded dates
           await eventsCol!.findOne(event.id).update({
-            $set: {
-              actualEnd: getActualEndDate(event),
+            $set: serializeEvent({
+              actualEnd: getDisplayEndDate(event),
               excludedDates: [
                 ...(event.excludedDates || []),
                 event.displayStart,
               ],
-            },
+            }),
           });
           break;
         case UpdateType.FOLLOWING:
           //set the repeat end date to the new event start date
-          const newEvent = {
-            ...event,
+          const { displayStart, displayEnd, ...originalEvent } = event;
+          const newEvent: CalendarEvent = {
+            ...originalEvent,
             repeat: {
               ...event.repeat!,
-              count: undefined,
-              date: subDays(event.displayStart, 1),
+              value: subDays(displayStart, 1).getTime(),
             },
           };
           await eventsCol!.findOne(event.id).update({