diff --git a/scripts/cypress/integration/common/3e_duration_column.js b/scripts/cypress/integration/common/3e_duration_column.js
index e86c36b1b4..ce7691d5ca 100644
--- a/scripts/cypress/integration/common/3e_duration_column.js
+++ b/scripts/cypress/integration/common/3e_duration_column.js
@@ -13,21 +13,26 @@ export const genTest = (apiType, dbType) => {
       cy.get("label").contains(label).parents(".ant-row").first().click();
     };
 
-    // Run once before test- create table
-    //
     before(() => {
-      mainPage.tabReset();
-
-      // // close team & auth tab
-      // cy.get('button.ant-tabs-tab-remove').should('exist').click();
-
+      cy.restoreLocalStorage();
       cy.createTable(tableName);
+      cy.saveLocalStorage();
+    });
+
+    // Run once before test- create table
+    //
+    beforeEach(() => {
+      cy.restoreLocalStorage();
     });
 
-    beforeEach(() => {});
+    afterEach(() => {
+      cy.saveLocalStorage();
+    });
 
     after(() => {
+      cy.restoreLocalStorage();
       cy.deleteTable(tableName);
+      cy.saveLocalStorage();
     });
 
     // Routine to create a new look up column
@@ -42,7 +47,6 @@ export const genTest = (apiType, dbType) => {
         .should("exist")
         .clear()
         .type(columnName);
-      // cy.get(".nc-column-type-input").last().click().type("Duration");
       cy.getActiveMenu(".nc-dropdown-grid-add-column")
         .find(".nc-column-type-input")
         .last()
@@ -53,6 +57,10 @@ export const genTest = (apiType, dbType) => {
         .contains("Duration")
         .click();
 
+      // fix me! wait till the modal rendering (input highlight) is completed
+      // focus shifts back to the input field to select text after the dropdown is rendered
+      cy.wait(500);
+
       // Configure Duration format
       fetchParentFromLabel("Duration Format");
       cy.getActiveSelection(".nc-dropdown-duration-option")
@@ -60,7 +68,6 @@ export const genTest = (apiType, dbType) => {
         .contains(durationFormat)
         .click();
 
-      // cy.get(".ant-btn-primary").contains("Save").should('exist').click();
       cy.getActiveMenu(".nc-dropdown-grid-add-column")
         .find(".ant-btn-primary:visible")
         .contains("Save")
@@ -83,8 +90,6 @@ export const genTest = (apiType, dbType) => {
         .trigger("mouseover", { force: true })
         .click({ force: true });
 
-      // cy.get(".nc-column-edit").click();
-      // cy.get(".nc-column-edit").should("not.be.visible");
       cy.getActiveMenu(".nc-dropdown-column-operations")
         .find(".nc-column-edit")
         .click();
@@ -95,6 +100,11 @@ export const genTest = (apiType, dbType) => {
         .should("exist")
         .clear()
         .type(newName);
+
+      // fix me! wait till the modal rendering (input highlight) is completed
+      // focus shifts back to the input field to select text after the dropdown is rendered
+      cy.wait(500);
+
       // Configure Duration format
       fetchParentFromLabel("Duration Format");
       cy.getActiveSelection(".nc-dropdown-duration-option")
@@ -102,7 +112,6 @@ export const genTest = (apiType, dbType) => {
         .contains(newDurationFormat)
         .click();
 
-      // cy.get(".ant-btn-primary:visible").contains("Save").click();
       cy.getActiveMenu(".nc-dropdown-edit-column")
         .find(".ant-btn-primary:visible")
         .contains("Save")
@@ -145,9 +154,6 @@ export const genTest = (apiType, dbType) => {
         .contains("Cancel")
         .should("exist")
         .click();
-      // mainPage.getCell(colName, index).find('input').then(($e) => {
-      //     expect($e[0].value).to.equal(expectedValue)
-      // })
       mainPage.getCell(colName, index).contains(expectedValue).should("exist");
     };
 
diff --git a/scripts/cypress/integration/test/pg-restTableOps.js b/scripts/cypress/integration/test/pg-restTableOps.js
index b60b13805f..d4a2d52e9f 100644
--- a/scripts/cypress/integration/test/pg-restTableOps.js
+++ b/scripts/cypress/integration/test/pg-restTableOps.js
@@ -31,7 +31,7 @@ const nocoTestSuite = (apiType, dbType) => {
   t3b.genTest(apiType, dbType);
   t3c.genTest(apiType, dbType);
   t3d.genTest(apiType, dbType);
-  // NcGUI v2 t3e.genTest(apiType, dbType);
+  t3e.genTest(apiType, dbType);
 };
 
 nocoTestSuite("rest", "postgres");
diff --git a/scripts/cypress/integration/test/restTableOps.js b/scripts/cypress/integration/test/restTableOps.js
index 75777ca93d..755e78599b 100644
--- a/scripts/cypress/integration/test/restTableOps.js
+++ b/scripts/cypress/integration/test/restTableOps.js
@@ -31,7 +31,7 @@ const nocoTestSuite = (apiType, dbType) => {
   t3b.genTest(apiType, dbType);
   t3c.genTest(apiType, dbType);
   t3d.genTest(apiType, dbType);
-  // NcGUI v2 t3e.genTest(apiType, dbType);
+  t3e.genTest(apiType, dbType);
   t3f.genTest(apiType, dbType);
 };
 
diff --git a/scripts/cypress/integration/test/xcdb-restTableOps.js b/scripts/cypress/integration/test/xcdb-restTableOps.js
index ff9e8b9460..c10904d458 100644
--- a/scripts/cypress/integration/test/xcdb-restTableOps.js
+++ b/scripts/cypress/integration/test/xcdb-restTableOps.js
@@ -30,7 +30,7 @@ const nocoTestSuite = (apiType, dbType) => {
   t3b.genTest(apiType, dbType);
   t3c.genTest(apiType, dbType);
   t3d.genTest(apiType, dbType);
-  // NcGUI v2 t3e.genTest(apiType, dbType);
+  t3e.genTest(apiType, dbType);
 };
 
 nocoTestSuite("rest", "xcdb");