diff --git a/tests/playwright/pages/Dashboard/Calendar/CalendarDayDateTime.ts b/tests/playwright/pages/Dashboard/Calendar/CalendarDayDateTime.ts
index ecb3caa231..de2c1d3337 100644
--- a/tests/playwright/pages/Dashboard/Calendar/CalendarDayDateTime.ts
+++ b/tests/playwright/pages/Dashboard/Calendar/CalendarDayDateTime.ts
@@ -21,14 +21,14 @@ export class CalendarDayDateTimePage extends BasePage {
     const recordContainer = this.getRecordContainer();
     const recordCard = recordContainer.getByTestId(`nc-calendar-day-record-${record}`);
     const toDay = this.get().getByTestId('nc-calendar-day-hour').nth(hourIndex);
+
+    await this.get().getByTestId('nc-calendar-day-hour').nth(0).scrollIntoViewIfNeeded();
+
     const cord = await toDay.boundingBox();
 
     await recordCard.scrollIntoViewIfNeeded();
     await recordCard.hover();
     await this.rootPage.mouse.down();
-    // Bit Flaky
-    await this.rootPage.waitForTimeout(500);
-
     await this.rootPage.mouse.move(cord.x + cord.width / 2, cord.y + cord.height / 2, {
       steps: 10,
     });
diff --git a/tests/playwright/tests/db/views/viewCalendar.spec.ts b/tests/playwright/tests/db/views/viewCalendar.spec.ts
index 3c6d99eb7f..93935bfde4 100644
--- a/tests/playwright/tests/db/views/viewCalendar.spec.ts
+++ b/tests/playwright/tests/db/views/viewCalendar.spec.ts
@@ -288,7 +288,7 @@ test.describe('Calendar View', () => {
     await dashboard.viewSidebar.deleteView({ title: 'Calendar' });
   });
 
-  test.skip('Calendar Drag and Drop & Undo Redo Operations', async () => {
+  test('Calendar Drag and Drop & Undo Redo Operations', async () => {
     test.slow();
 
     await dashboard.treeView.openBase({ title: `xcdb${context.workerId}` });
@@ -350,7 +350,7 @@ test.describe('Calendar View', () => {
 
     await calendar.toolbar.calendarViewMode.changeCalendarView({ title: 'day' });
 
-    await dashboard.rootPage.waitForTimeout(5000);
+    await dashboard.rootPage.waitForTimeout(2000);
 
     await calendar.calendarDayDateTime.dragAndDrop({
       record: 'Team Catchup',