diff --git a/frontend_tests/casper_tests/08-edit.js b/frontend_tests/casper_tests/08-edit.js
index c40c724503..fd09a51a32 100644
--- a/frontend_tests/casper_tests/08-edit.js
+++ b/frontend_tests/casper_tests/08-edit.js
@@ -10,7 +10,9 @@ function then_edit_last_message() {
             $('.popover_edit_message').click();
         });
     });
-    casper.waitForSelector(".message_edit_content");
+    casper.then(function () {
+        casper.waitUntilVisible(".message_edit_content");
+    });
 }
 
 // Send and edit a stream message