diff --git a/tests/src/FunctionalJavascript/ModalHeightTest.php b/tests/src/FunctionalJavascript/ModalHeightTest.php
index 9188c9df524b2c5c19d18d2895670faa83a750d7..ac55abc5de99c17e02d24dcd54b2c4a572aaeb77 100644
--- a/tests/src/FunctionalJavascript/ModalHeightTest.php
+++ b/tests/src/FunctionalJavascript/ModalHeightTest.php
@@ -34,8 +34,8 @@ class ModalHeightTest extends BuilderTestBase {
     $this->getSession()->executeScript('jQuery(\'.layout-paragraphs-component-form\').height(\'2000px\');');
 
     // Save button should be reachable.
-    $this->assertSession()->waitForElementVisible('css', '.lpb-btn--save');
-    $this->assertSession()->assertVisibleInViewport('css', '.lpb-btn--save');
+    $this->assertSession()->waitForElementVisible('css', '.ui-dialog-buttonpane .lpb-btn--save', 1000);
+    $this->assertSession()->assertVisibleInViewport('css', '.ui-dialog-buttonpane .lpb-btn--save');
 
   }