diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 611909be..bbfc69d1 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -46,7 +46,6 @@ declare module 'vue' {
     BrandLogo: typeof import('./src/components/BrandLogo.vue')['default']
     BrandSettings: typeof import('./src/components/Settings/General/BrandSettings.vue')['default']
     BulkDeleteLinkedDocModal: typeof import('./src/components/BulkDeleteLinkedDocModal.vue')['default']
-    CalendarEventDetails: typeof import('./src/components/Calendar/CalendarEventDetails.vue')['default']
     CalendarEventPanel: typeof import('./src/components/Calendar/CalendarEventPanel.vue')['default']
     CalendarIcon: typeof import('./src/components/Icons/CalendarIcon.vue')['default']
     CalendarModal: typeof import('./src/components/Modals/CalendarModal.vue')['default']
@@ -191,6 +190,7 @@ declare module 'vue' {
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
     LostReasonModal: typeof import('./src/components/Modals/LostReasonModal.vue')['default']
+    LucideCalendar: typeof import('~icons/lucide/calendar')['default']
     LucideChevronLeft: typeof import('~icons/lucide/chevron-left')['default']
     LucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
     LucideEarth: typeof import('~icons/lucide/earth')['default']
diff --git a/frontend/src/components/Calendar/CalendarEventDetails.vue b/frontend/src/components/Calendar/CalendarEventDetails.vue
deleted file mode 100644
index 4263b10a..00000000
--- a/frontend/src/components/Calendar/CalendarEventDetails.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <div v-if="show" class="w-[352px] border-l">
-    <div
-      class="flex items-center justify-between p-4.5 text-ink-gray-7 text-lg font-medium"
-    >
-      <div>{{ __('Event details') }}</div>
-      <div class="flex items-center gap-x-1">
-        <Button variant="ghost" @click="editDetails">
-          <template #icon>
-            <EditIcon class="size-4" />
-          </template>
-        </Button>
-        <Button icon="trash-2" variant="ghost" @click="deleteEvent" />
-        <Dropdown
-          v-if="event.id"
-          :options="[
-            {
-              label: __('Duplicate'),
-              icon: 'copy',
-              onClick: duplicateEvent,
-            },
-          ]"
-        >
-          <Button variant="ghost" icon="more-vertical" />
-        </Dropdown>
-        <Button
-          icon="x"
-          variant="ghost"
-          @click="
-            () => {
-              show = false
-              activeEvent = ''
-            }
-          "
-        />
-      </div>
-    </div>
-    <div class="text-base">
-      <div class="flex items-start gap-2 px-4.5 py-3 pb-0">
-        <div
-          class="mx-0.5 my-[5px] size-2.5 rounded-full cursor-pointer"
-          :style="{
-            backgroundColor: event.color || '#30A66D',
-          }"
-        />
-        <div class="flex flex-col gap-[3px]">
-          <div class="text-ink-gray-8 font-semibold text-xl">
-            {{ event.title || __('(No title)') }}
-          </div>
-          <div class="text-ink-gray-6 text-p-base">{{ formattedDateTime }}</div>
-        </div>
-      </div>
-      <div
-        v-if="event.description && event.description !== '<p></p>'"
-        class="mx-4.5 my-2.5 border-t border-outline-gray-1"
-      />
-      <div v-if="event.description && event.description !== '<p></p>'">
-        <div class="flex gap-2 items-center text-ink-gray-7 px-4.5 py-1">
-          <DescriptionIcon class="size-4" />
-          {{ __('Description') }}
-        </div>
-        <div
-          class="px-4.5 py-2 text-ink-gray-7 text-p-base"
-          v-html="event.description"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-<script setup>
-import DescriptionIcon from '@/components/Icons/DescriptionIcon.vue'
-import EditIcon from '@/components/Icons/EditIcon.vue'
-import { Dropdown, CalendarActiveEvent as activeEvent, dayjs } from 'frappe-ui'
-import { computed } from 'vue'
-
-const props = defineProps({
-  event: {
-    type: Object,
-    required: true,
-  },
-})
-
-const show = defineModel()
-
-const emit = defineEmits(['edit', 'delete'])
-
-const formattedDateTime = computed(() => {
-  if (props.event.isFullDay) {
-    return `${__('All day')} - ${dayjs(props.event.fromDateTime).format('ddd, D MMM YYYY')}`
-  }
-
-  const start = dayjs(props.event.fromDateTime)
-  const end = dayjs(props.event.toDateTime)
-  return `${start.format('h:mm a')} - ${end.format('h:mm a')} ${start.format('ddd, D MMM YYYY')}`
-})
-
-function deleteEvent() {
-  emit('delete', props.event.id)
-}
-
-function duplicateEvent() {
-  emit('duplicate', props.event)
-}
-
-function editDetails() {
-  emit('edit', props.event)
-}
-</script>
diff --git a/frontend/src/components/Calendar/CalendarEventPanel.vue b/frontend/src/components/Calendar/CalendarEventPanel.vue
index 9b471b56..0ced558b 100644
--- a/frontend/src/components/Calendar/CalendarEventPanel.vue
+++ b/frontend/src/components/Calendar/CalendarEventPanel.vue
@@ -5,21 +5,26 @@
     >
       <div
         class="flex items-center gap-x-2"
-        :class="event.id && 'cursor-pointer hover:text-ink-gray-8'"
-        @click="event.id && goToDetails()"
+        :class="mode == 'edit' && 'cursor-pointer hover:text-ink-gray-8'"
+        @click="mode == 'edit' && details()"
       >
-        <LucideChevronLeft v-if="event.id" class="size-4" />
+        <LucideChevronLeft v-if="mode == 'edit'" class="size-4" />
         {{ __(title) }}
       </div>
       <div class="flex items-center gap-x-1">
+        <Button v-if="mode == 'details'" variant="ghost" @click="editDetails">
+          <template #icon>
+            <EditIcon class="size-4" />
+          </template>
+        </Button>
         <Button
-          v-if="event.id"
+          v-if="mode === 'edit' || mode === 'details'"
           icon="trash-2"
           variant="ghost"
           @click="deleteEvent"
         />
         <Dropdown
-          v-if="event.id"
+          v-if="mode === 'edit' || mode === 'details'"
           :options="[
             {
               label: __('Duplicate'),
@@ -30,19 +35,10 @@
         >
           <Button variant="ghost" icon="more-vertical" />
         </Dropdown>
-        <Button
-          icon="x"
-          variant="ghost"
-          @click="
-            () => {
-              show = false
-              activeEvent = ''
-            }
-          "
-        />
+        <Button icon="x" variant="ghost" @click="close" />
       </div>
     </div>
-    <div class="text-base">
+    <div v-if="mode !== 'details'" class="text-base">
       <div>
         <div class="px-4.5 py-3">
           <TextInput
@@ -149,13 +145,14 @@
             />
           </div>
           <div class="my-3">
-            <Button
-              variant="solid"
-              class="w-full"
-              :disabled="!dirty"
-              @click="saveEvent"
-            >
-              {{ _event.id ? __('Save') : __('Create event') }}
+            <Button variant="solid" class="w-full" @click="saveEvent">
+              {{
+                mode === 'edit'
+                  ? __('Save')
+                  : mode === 'duplicate'
+                    ? __('Duplicate event')
+                    : __('Create event')
+              }}
             </Button>
           </div>
 
@@ -163,10 +160,42 @@
         </div>
       </div>
     </div>
+    <div v-else class="text-base">
+      <div class="flex items-start gap-2 px-4.5 py-3 pb-0">
+        <div
+          class="mx-0.5 my-[5px] size-2.5 rounded-full cursor-pointer"
+          :style="{
+            backgroundColor: event.color || '#30A66D',
+          }"
+        />
+        <div class="flex flex-col gap-[3px]">
+          <div class="text-ink-gray-8 font-semibold text-xl">
+            {{ event.title || __('(No title)') }}
+          </div>
+          <div class="text-ink-gray-6 text-p-base">{{ formattedDateTime }}</div>
+        </div>
+      </div>
+      <div
+        v-if="event.description && event.description !== '<p></p>'"
+        class="mx-4.5 my-2.5 border-t border-outline-gray-1"
+      />
+      <div v-if="event.description && event.description !== '<p></p>'">
+        <div class="flex gap-2 items-center text-ink-gray-7 px-4.5 py-1">
+          <DescriptionIcon class="size-4" />
+          {{ __('Description') }}
+        </div>
+        <div
+          class="px-4.5 py-2 text-ink-gray-7 text-p-base"
+          v-html="event.description"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup>
+import EditIcon from '@/components/Icons/EditIcon.vue'
+import DescriptionIcon from '@/components/Icons/DescriptionIcon.vue'
 import TimePicker from './TimePicker.vue'
 import { getFormat } from '@/utils'
 import {
@@ -187,9 +216,13 @@ const props = defineProps({
     type: Object,
     default: null,
   },
+  mode: {
+    type: String,
+    default: 'details',
+  },
 })
 
-const emit = defineEmits(['save', 'delete', 'goToDetails'])
+const emit = defineEmits(['save', 'delete', 'details', 'close', 'edit'])
 
 const show = defineModel()
 
@@ -199,29 +232,22 @@ const _event = ref({})
 const eventTitle = ref(null)
 const error = ref(null)
 
-const dirty = computed(() => {
-  return JSON.stringify(_event.value) !== JSON.stringify(props.event)
-})
-
 watch(
   () => props.event,
   (newEvent) => {
     error.value = null
 
-    if (newEvent && newEvent.id) {
+    if (props.mode === 'details') {
+      title.value = 'Event details'
+    } else if (props.mode === 'edit') {
       title.value = 'Editing event'
-    } else if (!newEvent.title) {
+    } else if (props.mode === 'create') {
       title.value = 'New event'
     } else {
       title.value = 'Duplicate event'
     }
 
-    nextTick(() => {
-      _event.value = { ...newEvent }
-      if (title.value == 'Duplicate event') {
-        _event.value.title = `${_event.value.title} (Copy)`
-      }
-    })
+    nextTick(() => (_event.value = { ...newEvent }))
     setTimeout(() => eventTitle.value?.el?.focus(), 100)
   },
   { immediate: true },
@@ -276,23 +302,38 @@ function saveEvent() {
   emit('save', _event.value)
 }
 
+function editDetails() {
+  emit('edit', _event.value)
+}
+
 function duplicateEvent() {
-  props.event.id = ''
-  title.value = 'Duplicate event'
-  _event.value = { ...props.event }
-  _event.value.title = `${_event.value.title} (Copy)`
-  nextTick(() => eventTitle.value?.el?.focus())
+  emit('duplicate', _event.value)
 }
 
 function deleteEvent() {
   emit('delete', _event.value.id)
 }
 
-function goToDetails() {
-  show.value = false
-  emit('goToDetails', _event.value)
+function details() {
+  emit('details', _event.value)
 }
 
+function close() {
+  show.value = false
+  activeEvent.value = ''
+  emit('close', _event.value)
+}
+
+const formattedDateTime = computed(() => {
+  if (props.event.isFullDay) {
+    return `${__('All day')} - ${dayjs(props.event.fromDateTime).format('ddd, D MMM YYYY')}`
+  }
+
+  const start = dayjs(props.event.fromDateTime)
+  const end = dayjs(props.event.toDateTime)
+  return `${start.format('h:mm a')} - ${end.format('h:mm a')} ${start.format('ddd, D MMM YYYY')}`
+})
+
 const colors = Object.keys(colorMap).map((color) => ({
   label: color.charAt(0).toUpperCase() + color.slice(1),
   value: colorMap[color].color,
diff --git a/frontend/src/pages/Calendar.vue b/frontend/src/pages/Calendar.vue
index c579fe6f..d6ccf996 100644
--- a/frontend/src/pages/Calendar.vue
+++ b/frontend/src/pages/Calendar.vue
@@ -86,18 +86,13 @@
       v-if="showEventPanel"
       v-model="showEventPanel"
       :event="event"
+      :mode="mode"
       @save="saveEvent"
-      @delete="deleteEvent"
-      @goToDetails="showDetails"
-    />
-
-    <CalendarEventDetails
-      v-if="showEventDetails"
-      v-model="showEventDetails"
-      :event="event"
       @edit="editDetails"
       @delete="deleteEvent"
       @duplicate="duplicateEvent"
+      @details="showDetails"
+      @close="close"
     />
   </div>
 </template>
@@ -182,9 +177,9 @@ function createEvent(_event) {
       onSuccess: (e) => {
         _event.id = e.name
         event.value = _event
-        showEventPanel.value = false
-        showEventDetails.value = true
+        showEventPanel.value = true
         activeEvent.value = e.name
+        mode.value = 'details'
       },
     },
   )
@@ -193,16 +188,18 @@ function createEvent(_event) {
 function updateEvent(_event) {
   if (!_event.id) return
 
-  events.setValue.submit({
-    name: _event.id,
-    subject: _event.title,
-    description: _event.description,
-    starts_on: _event.fromDateTime,
-    ends_on: _event.toDateTime,
-    all_day: _event.isFullDay,
-    event_type: _event.eventType,
-    color: _event.color,
-  })
+  if (mode.value === 'edit' || mode.value === 'details') {
+    events.setValue.submit({
+      name: _event.id,
+      subject: _event.title,
+      description: _event.description,
+      starts_on: _event.fromDateTime,
+      ends_on: _event.toDateTime,
+      all_day: _event.isFullDay,
+      event_type: _event.eventType,
+      color: _event.color,
+    })
+  }
 
   event.value = _event
 }
@@ -223,9 +220,9 @@ function deleteEvent(eventID) {
         onClick: (close) => {
           events.delete.submit(eventID)
           showEventPanel.value = false
-          showEventDetails.value = false
           event.value = {}
           activeEvent.value = ''
+          mode.value = ''
           close()
         },
       },
@@ -235,56 +232,86 @@ function deleteEvent(eventID) {
 
 onMounted(() => {
   activeEvent.value = ''
+  mode.value = ''
   showEventPanel.value = false
-  showEventDetails.value = false
 })
 
 const showEventPanel = ref(false)
-const showEventDetails = ref(false)
 const event = ref({})
+const mode = ref('')
 
 function showDetails(e) {
   let _e = e?.calendarEvent || e
-  showEventPanel.value = false
-  showEventDetails.value = true
+  showEventPanel.value = true
   event.value = { ..._e }
   activeEvent.value = _e.id
+  mode.value = 'details'
 }
 
 function editDetails(e) {
   let _e = e?.calendarEvent || e
-  showEventDetails.value = false
   showEventPanel.value = true
   event.value = { ..._e }
   activeEvent.value = _e.id
+  mode.value = 'edit'
 }
 
-function newEvent(e) {
-  let [fromTime, toTime] = getFromToTime(e.time)
+function newEvent(e, duplicate = false) {
+  let fromTime = e.fromTime
+  let toTime = e.toTime
+  let fromDate = e.fromDate
 
-  let fromDate = dayjs(e.date).format('YYYY-MM-DD')
+  if (!duplicate) {
+    let t = getFromToTime(e.time)
+    fromTime = t[0]
+    toTime = t[1]
+    fromDate = dayjs(e.date).format('YYYY-MM-DD')
+  }
 
-  activeEvent.value = ''
-  showEventDetails.value = false
   showEventPanel.value = true
+
   event.value = {
-    title: '',
-    description: '',
+    title: duplicate ? `${e.title} (Copy)` : '',
+    description: e.description || '',
     date: fromDate,
     fromDate: fromDate,
     toDate: fromDate,
     fromTime,
     toTime,
-    isFullDay: false,
-    eventType: 'Public',
+    isFullDay: e.isFullDay,
+    eventType: e.eventType || 'Public',
+    color: e.color || 'green',
   }
+
+  events.data.push({
+    id: duplicate ? 'duplicate-event' : 'new-event',
+    title: duplicate ? `${e.title} (Copy)` : '',
+    description: e.description || '',
+    status: 'Open',
+    eventType: e.eventType || 'Public',
+    fromDate: fromDate + ' ' + fromTime,
+    toDate: fromDate + ' ' + toTime,
+    color: e.color || 'green',
+    isFullDay: e.isFullDay,
+  })
+
+  activeEvent.value = duplicate ? 'duplicate-event' : 'new-event'
+  mode.value = duplicate ? 'duplicate' : 'create'
 }
 
 function duplicateEvent(e) {
-  showEventDetails.value = false
-  showEventPanel.value = true
-  e.id = ''
-  event.value = { ...e }
+  newEvent(e, true)
+}
+
+function close() {
+  showEventPanel.value = false
+  event.value = {}
+  activeEvent.value = ''
+  mode.value = ''
+
+  events.data = events.data.filter(
+    (ev) => ev.id !== 'new-event' && ev.id !== 'duplicate-event',
+  )
 }
 
 // utils