diff --git a/cypress.config.js b/cypress.config.js
index eb24ae27..e1e3d7ce 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -9,7 +9,7 @@ module.exports = defineConfig({
   video: false,
   viewportWidth: 1920,
   viewportHeight: 1080,
-  defaultCommandTimeout: 15000,
+  defaultCommandTimeout: 30000,
   retries: 3,
 
   e2e: {
diff --git a/cypress/support/util/common.js b/cypress/support/util/common.js
index ae454ee6..bfc24090 100644
--- a/cypress/support/util/common.js
+++ b/cypress/support/util/common.js
@@ -76,6 +76,7 @@ export const checkIncidentCellContent = (incidentId, incidentHeader, content) =>
 
 export const checkIncidentCellContentAllRows = (incidentHeader, content) => {
   cy.wait(2000);
+  cy.get('.incident-table-fixed-list').scrollTo('top', { ensureScrollable: true });
   cy.get('.incident-table-fixed-list > div').then(($tbody) => {
     const visibleIncidentCount = $tbody.find('[role="row"]').length;
     for (let incidentIdx = 0; incidentIdx < visibleIncidentCount; incidentIdx++) {