diff --git a/packages/nc-gui/components/smartsheet/calendar/WeekView.vue b/packages/nc-gui/components/smartsheet/calendar/WeekView.vue
index 4d1ac8d4ce..590ecfa56f 100644
--- a/packages/nc-gui/components/smartsheet/calendar/WeekView.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/WeekView.vue
@@ -503,7 +503,7 @@ const dragStart = (event: MouseEvent, record: Row) => {
         @click="selectedDate = date"
       ></div>
     </div>
-    <div class="absolute mt-9 pointer-events-none inset-0">
+    <div class="absolute nc-scrollbar-md overflow-y-auto mt-9 pointer-events-none inset-0">
       <div
         v-for="(record, id) in calendarData"
         :key="id"
@@ -530,7 +530,7 @@ const dragStart = (event: MouseEvent, record: Row) => {
             :record="record"
             :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
             color="blue"
-            @click="emits('expand-record', record)"
+            @dblclick="emits('expand-record', record)"
             @resize-start="onResizeStart"
           />
         </LazySmartsheetRow>
diff --git a/packages/nc-gui/composables/useCalendarViewStore.ts b/packages/nc-gui/composables/useCalendarViewStore.ts
index 156caef15d..e026e991a9 100644
--- a/packages/nc-gui/composables/useCalendarViewStore.ts
+++ b/packages/nc-gui/composables/useCalendarViewStore.ts
@@ -665,11 +665,11 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
                 if (row) {
                   Object.assign(row.row, updatedData)
                 }
-                Object.assign(row.oldRow, updatedData)
+                Object.assign(row!.oldRow, updatedData)
               },
               args: [clone(toUpdate), property],
             },
-            scope: defineViewScope({ view: viewMeta.value }),
+            scope: defineViewScope({ view: viewMeta.value as ViewType }),
           })
           Object.assign(toUpdate.row, updatedRowData)
           Object.assign(toUpdate.oldRow, updatedRowData)