diff --git a/test/e2e/lib/page.js b/test/e2e/lib/page.js
index 3026f671..d455d895 100644
--- a/test/e2e/lib/page.js
+++ b/test/e2e/lib/page.js
@@ -35,6 +35,10 @@ module.exports = (...extras) => Object.assign({
     async waitUntilVisible(selector) {
         await driver.wait(until.elementLocated(By.css('body')), waitTimeout);
 
+        if (selector) {
+            await driver.wait(until.elementLocated(By.css(selector)), waitTimeout);
+        }
+        
         for (const elem of (this.elementsToWaitFor || [])) {
             const sel = this.elements[elem];
             if (!sel) {