diff --git a/functional-test/src/main/java/org/zanata/page/CorePage.java b/functional-test/src/main/java/org/zanata/page/CorePage.java
index 8fdb5373f0..a621b1f2f0 100644
--- a/functional-test/src/main/java/org/zanata/page/CorePage.java
+++ b/functional-test/src/main/java/org/zanata/page/CorePage.java
@@ -140,9 +140,9 @@ public List<String> expectErrors() {
 
     public String getNotificationMessage() {
         log.info("Query notification message");
-        List<WebElement>messages = (List<WebElement>) getExecutor()
-                .executeScript("return $('#messages li')");
-        return messages.size() > 0 ? messages.get(0).getText() : "";
+        WebElement message = waitForElementExists(
+                By.cssSelector("#messages li"));
+        return message.getText();
     }
 
     public boolean expectNotification(final String notification) {