diff --git a/src/Context/BasicContext.php b/src/Context/BasicContext.php
index 4e2552be..468af3f4 100644
--- a/src/Context/BasicContext.php
+++ b/src/Context/BasicContext.php
@@ -1151,16 +1151,20 @@ public function iWaitUntilISeeText($text)
         $page = $this->getSession()->getPage();
         $session = $this->getSession();
         $this->spin(function () use ($page, $session, $text) {
-            $element = $page->find(
+            $elements = $page->findAll(
                 'xpath',
                 $session->getSelectorsHandler()->selectorToXpath("xpath", ".//*[contains(text(), '$text')]")
             );
-
-            if (empty($element)) {
-                return false;
-            } else {
-                return ($element->isVisible());
+            foreach ($elements as $element) {
+                if (empty($element)) {
+                    continue;
+                }
+                if (!$element->isVisible()) {
+                    continue;
+                }
+                return true;
             }
+            return false;
         });
     }