1 files changed, 2 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/testbench/elements/GridElement.java b/uitest/src/com/vaadin/testbench/elements/GridElement.java
index 5a27bc1444..6b1279d2c2 100644
--- a/uitest/src/com/vaadin/testbench/elements/GridElement.java
+++ b/uitest/src/com/vaadin/testbench/elements/GridElement.java
@@ -106,8 +106,7 @@ public class GridElement extends AbstractComponentElement {
          * useless.
          */
         public void save() {
-            List<WebElement> buttons = findElements(By.xpath("./button"));
-            buttons.get(0).click();
+            findElement(By.className("v-grid-editor-save")).click();
         }
 
         /**
@@ -117,8 +116,7 @@ public class GridElement extends AbstractComponentElement {
          * useless.
          */
         public void cancel() {
-            List<WebElement> buttons = findElements(By.xpath("./button"));
-            buttons.get(1).click();
+            findElement(By.className("v-grid-editor-cancel")).click();
         }
     }