diff --git a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/test/java/com/vaadin/flow/component/spreadsheet/test/ContextMenuIT.java b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/test/java/com/vaadin/flow/component/spreadsheet/test/ContextMenuIT.java
index 0cd45689430..900fafe1cd7 100644
--- a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/test/java/com/vaadin/flow/component/spreadsheet/test/ContextMenuIT.java
+++ b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/test/java/com/vaadin/flow/component/spreadsheet/test/ContextMenuIT.java
@@ -117,12 +117,6 @@ public void contextMenu_itemsContainExpectedIcons() {
         Assert.assertEquals("lumo:angle-up", lumoAttr);
     }
 
-    private WebElement getIconFromAction(String actionText) {
-        return findElement(By.xpath("//div[@class='popupContent']//*[text()='"
-                + actionText
-                + "']/ancestor::*[contains(@class,'gwt-MenuItem')]//*[@icon]"));
-    }
-
     @Test
     public void contextMenu_rowHeader_itemsContainExpectedIcons() {
         loadTestFixture(TestFixtures.IconAction);
@@ -144,4 +138,12 @@ public void contextMenu_columnHeader_itemsContainExpectedIcons() {
         var colIcon = getIconFromAction("Column action");
         Assert.assertEquals("lumo:cog", colIcon.getAttribute("icon"));
     }
+
+    private WebElement getIconFromAction(String actionText) {
+        return findElements(By.className("gwt-MenuItem")).stream()
+                .filter(el -> el.getText().equals(actionText))
+                .map(el -> el.findElement(By.tagName("vaadin-icon")))
+                .findFirst().orElseThrow();
+    }
+
 }