diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
index 6a32ad5897..d1203410f4 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Onboarding/Onboarding_spec.js
@@ -17,7 +17,7 @@ describe("Onboarding", function() {
 
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(5000);
-
+    cy.get(".bp3-spinner-head").should("not.exist");
     cy.get(".t--start-building")
       .should("be.visible")
       .click({ force: true });
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index b411a810e7..8f15bed44a 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1291,6 +1291,7 @@ Cypress.Commands.add("tableDataVisiblity", (endp, value) => {
 
 Cypress.Commands.add("tableColumnDataValidation", (columnName) => {
   cy.get("[data-rbd-draggable-id='" + columnName + "']")
+    .scrollIntoView()
     .first()
     .focus({ force: true })
     .should("be.visible");
@@ -1298,6 +1299,7 @@ Cypress.Commands.add("tableColumnDataValidation", (columnName) => {
 
 Cypress.Commands.add("tableColumnPopertyUpdate", (colId, newColName) => {
   cy.get("[data-rbd-draggable-id='" + colId + "'] input")
+    .scrollIntoView()
     .should("be.visible")
     .click({
       force: true,