diff --git a/e2e/support/helpers/e2e-models-metadata-helpers.js b/e2e/support/helpers/e2e-models-metadata-helpers.js
index 97f0524dfc7a7b4a353aeed710fdacf3e7e15f7e..fece8363e2f1168f0527ac44a9f9a77fe3a83c8c 100644
--- a/e2e/support/helpers/e2e-models-metadata-helpers.js
+++ b/e2e/support/helpers/e2e-models-metadata-helpers.js
@@ -34,9 +34,11 @@ export function setColumnType(oldType, newType) {
     .contains(oldType)
     .click();
 
-  cy.get(".ReactVirtualized__Grid.MB-Select").realMouseWheel({ deltaY: -200 });
-  cy.findByPlaceholderText("Search for a special type").realType(newType);
-  popover().findByLabelText(newType).click();
+  popover().within(() => {
+    cy.findByText(oldType).closest(".ReactVirtualized__Grid").scrollTo(0, 0); // HACK: scroll to the top of the list. Ideally we should probably disable AccordionList virtualization
+    cy.findByPlaceholderText("Search for a special type").realType(newType);
+    cy.findByLabelText(newType).click();
+  });
 }
 
 export function mapColumnTo({ table, column } = {}) {