diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditRowTest.java
index 331c6c7f11a..044cff0a4f7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditRowTest.java
@@ -67,6 +67,8 @@ public void testEditWhenAllRowsVisible() {
         assertRowContents(0);
 
         waitForElementVisible(By.className("v-grid-editor"));
+        // wait for position corrections
+        sleep(100);
 
         assertEditorWithinGrid();
     }
@@ -80,6 +82,8 @@ public void testEditWhenSomeRowsNotVisible() {
         editLastRow();
 
         waitForElementVisible(By.className("v-grid-editor"));
+        // wait for position corrections
+        sleep(100);
 
         assertRowContents(3);
         assertEditorWithinGrid();
@@ -94,6 +98,8 @@ public void testEditWhenSomeRowsOutsideOfCache() {
         editLastRow();
 
         waitForElementVisible(By.className("v-grid-editor"));
+        // wait for position corrections
+        sleep(100);
 
         assertRowContents(91);
         assertEditorWithinGrid();