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 5457dd55f88faeaa2ab0fa88f962008d45552c37..f883b29c8018c42e986ab83f628b7d9bb3be6053 100644
--- a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
@@ -64,7 +64,7 @@ public class CatalogAdminPage {
 		By saveBy = By.cssSelector(".o_sel_catalog_add_category_popup .o_sel_catalog_entry_form_buttons button.btn-primary");
 		browser.findElement(saveBy).click();
 		OOGraphene.waitBusy(browser);
-		By nodeTitleBy = By.xpath("//div[contains(@class,'o_meta')]//h4[contains(@class,'o_title')][contains(text(),'" + shortTitle + "')]");
+		By nodeTitleBy = By.xpath("//div[contains(@class,'o_meta')]//h4[contains(@class,'o_title')]/a/span[contains(text(),'" + shortTitle + "')]");
 		OOGraphene.waitElement(nodeTitleBy, browser);
 		return this;
 	}
@@ -76,7 +76,7 @@ public class CatalogAdminPage {
 	 * @return
 	 */
 	public CatalogAdminPage selectNode(String shortTitle) {
-		By titleBy = By.xpath("//div[contains(@class,'o_sublevel')][div[contains(@class,'o_meta')]//h4[contains(@class,'o_title')][text()[contains(.,'" + shortTitle + "')]]]/div/a");
+		By titleBy = By.xpath("//div[contains(@class,'o_sublevel')]/div[contains(@class,'o_meta')]/h4[contains(@class,'o_title')]/a[span[text()[contains(.,'" + shortTitle + "')]]]");
 		OOGraphene.waitElement(titleBy, browser);
 		browser.findElements(titleBy).get(0).click();
 		OOGraphene.waitBusy(browser);
diff --git a/src/test/java/org/olat/selenium/page/repository/CatalogPage.java b/src/test/java/org/olat/selenium/page/repository/CatalogPage.java
index 582f966a46c3a06fe8ab2055afe3da1676736c7b..c201a2b015707fe453ee730215192d01f2a848aa 100644
--- a/src/test/java/org/olat/selenium/page/repository/CatalogPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CatalogPage.java
@@ -43,7 +43,7 @@ public class CatalogPage {
 	}
 	
 	public CatalogPage selectCatalogEntry(String title, String shortTitle) {
-		By titleBy = By.xpath("//div[contains(@class,'o_sublevel')][div/h4[contains(@class,'o_title')][text()[contains(.,'" + shortTitle + "')]]]/div/a");
+		By titleBy = By.xpath("//div[contains(@class,'o_sublevel')]/div/h4[contains(@class,'o_title')]/a[span[text()[contains(.,'" + shortTitle + "')]]]");
 		List<WebElement> titleLinks = browser.findElements(titleBy);
 		Assert.assertFalse(titleLinks.isEmpty());
 		titleLinks.get(0).click();