diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index 3c4d6e62dc..e377f2a75e 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -55,7 +55,7 @@ export class GridPage extends BasePage {
 
   async verifyLockMode() {
     // add new row button
-    expect(await this.btn_addNewRow.count()).toBe(0);
+    expect(await this.btn_addNewRow.count()).toBe(1);
 
     await this.toolbar.verifyLockMode();
     await this.footbar.verifyLockMode();
diff --git a/tests/playwright/pages/Dashboard/common/Footbar/index.ts b/tests/playwright/pages/Dashboard/common/Footbar/index.ts
index df4349dd27..f0e6c6e438 100644
--- a/tests/playwright/pages/Dashboard/common/Footbar/index.ts
+++ b/tests/playwright/pages/Dashboard/common/Footbar/index.ts
@@ -45,7 +45,7 @@ export class FootbarPage extends BasePage {
 
   async verifyLockMode() {
     // add record button
-    await expect(this.btn_addNewRow).toBeVisible({ visible: false });
+    await expect(this.btn_addNewRow).toBeVisible({ visible: true });
   }
 
   async verifyCollaborativeMode() {
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/ViewMenu.ts b/tests/playwright/pages/Dashboard/common/Toolbar/ViewMenu.ts
index 477713a47a..37d509e9cd 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/ViewMenu.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/ViewMenu.ts
@@ -86,6 +86,9 @@ export class ToolbarViewMenuPage extends BasePage {
   // todo: Move verification out of the click method
   async click({ menu, subMenu, verificationInfo }: { menu: string; subMenu?: string; verificationInfo?: any }) {
     await this.viewsMenuBtn.click();
+
+    await this.rootPage.waitForTimeout(1000);
+
     await this.get().locator(`.ant-dropdown-menu-title-content:has-text("${menu}")`).first().click();
     if (subMenu) {
       // for CSV download, pass locator instead of clicking it here
diff --git a/tests/playwright/tests/db/general/viewMenu.spec.ts b/tests/playwright/tests/db/general/viewMenu.spec.ts
index ca3ef4fbae..fc6b931fa8 100644
--- a/tests/playwright/tests/db/general/viewMenu.spec.ts
+++ b/tests/playwright/tests/db/general/viewMenu.spec.ts
@@ -23,7 +23,7 @@ test.describe('Grid view locked', () => {
 
     // enable view lock
     await dashboard.grid.toolbar.viewsMenu.click({
-      menu: 'Collaborative',
+      menu: 'View Mode',
       subMenu: 'Locked',
     });
 
@@ -32,7 +32,7 @@ test.describe('Grid view locked', () => {
 
     // enable collaborative view
     await dashboard.grid.toolbar.viewsMenu.click({
-      menu: 'Locked',
+      menu: 'View Mode',
       subMenu: 'Collaborative',
     });