diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index dc209dde9ece718219e2fd5ef5b4641a4a40d700..7f7ad387f333f5d18f1413facd801c2a3fbd2ea2 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -269,8 +269,7 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
    * @Then /^the editor media browser should be open$/
    */
   public function theEitorMediaBrowserIsOpen() {
-
-    if (!$this->getSession()->getPage()->find('css', '.ui-dialog.media-wrapper')
+    if (!$elem = $this->getSession()->getPage()->find('css', '.ui-dialog.media-wrapper')
       || !$this->getSession()->getPage()->find('css', '.ui-dialog.media-wrapper .media-browser-panes')) {
       throw new \Exception('The editor media browser failed to open.');
     }
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
index 8f9d25a462263e8bd6375165038af5ddabd8f2a7..5d3e58fd9cc1c6a7b8d83f7e05673280a2faeb0d 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-05-embed-existing-media-image-library.feature
@@ -47,10 +47,13 @@ So that it will show up under that rich text field without having to upload the
      Then I should see "Test Basic page to embed existing files"
      When I click "Edit" in the "Test Basic page to embed existing files" row
       And I wait
+      And I wait for 5 seconds
      Then I should see "Edit Basic page Test Basic page to embed existing files"
      When I move focus to "Body" rich text editor field
       And I click the editor media browser command button
+      And I wait
       And I wait for AJAX to finish
+      And I wait
       And I wait for 5 seconds
      Then the editor media browser should be open
      When I switch to iframe "entity_browser_iframe_editor_media_browser"