diff --git a/src/test/java/org/olat/selenium/page/LoginPage.java b/src/test/java/org/olat/selenium/page/LoginPage.java
index a7758940d50b35fedc901eeb940ad31b6ef5de85..950816af7c5371a92ff82031c97ea27ebafb49bf 100644
--- a/src/test/java/org/olat/selenium/page/LoginPage.java
+++ b/src/test/java/org/olat/selenium/page/LoginPage.java
@@ -89,6 +89,7 @@ public class LoginPage {
 	}
 	
 	public void assertLoggedInByLastName(String lastName) {
+		OOGraphene.waitElement(usernameFooterBy, 5, browser);
 		WebElement username = browser.findElement(usernameFooterBy);
 		Assert.assertNotNull(username);
 		Assert.assertTrue(username.isDisplayed());
@@ -170,8 +171,10 @@ public class LoginPage {
 			
 			WebElement acknowledgeButton = browser.findElement(disclaimerButtonXPath);
 			Graphene.guardHttp(acknowledgeButton).click();
-			OOGraphene.waitElement(authXPath, browser);
 		}
+		
+		//wait until the content appears
+		OOGraphene.waitElement(authXPath, browser);
 		return this;
 	}
 	
diff --git a/src/test/java/org/olat/selenium/page/NavigationPage.java b/src/test/java/org/olat/selenium/page/NavigationPage.java
index 37d5d077b4b707eaf9f76060658c4cd619555e9b..9035a79dcd98b28c163797590f1faae2fe352326 100644
--- a/src/test/java/org/olat/selenium/page/NavigationPage.java
+++ b/src/test/java/org/olat/selenium/page/NavigationPage.java
@@ -159,6 +159,9 @@ public class NavigationPage {
 		List<WebElement> openMoreLinks = browser.findElements(openMoreBy);
 		Assert.assertFalse(openMoreLinks.isEmpty());
 		openMoreLinks.get(0).click();
+		//wait the small transition
+		By openedMoreMenuby = By.cssSelector("#o_navbar_more ul.dropdown-menu.dropdown-menu-right");
+		OOGraphene.waitElement(openedMoreMenuby, 5, browser);
 	}
 	
 	public NavigationPage backToTheTop() {
diff --git a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
index 379aa13060404547510dea6555888ea2f40b8ddf..85a8c8e07536d107360c857094c4df8d66f477ad 100644
--- a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
@@ -58,15 +58,14 @@ public class CatalogAdminPage {
 	public CatalogAdminPage addCatalogNode(String title, String description) {
 		//click in toolbox
 		By addNodeBy = By.className("o_sel_catalog_add_category");
-		WebElement addNodeLink = browser.findElement(addNodeBy);
-		addNodeLink.click();
-		OOGraphene.waitingALittleBit();
+		browser.findElement(addNodeBy).click();
+		OOGraphene.waitBusy(browser);
+		OOGraphene.waitModalDialog(browser);
 		
 		//fill the form
 		By titleBy = By.cssSelector(".o_sel_catalog_add_category_popup input[type='text']");
 		OOGraphene.waitElement(titleBy, browser);
-		WebElement titleEl = browser.findElement(titleBy);
-		titleEl.sendKeys(title);
+		browser.findElement(titleBy).sendKeys(title);
 		
 		OOGraphene.tinymce(description, browser);