diff --git a/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java b/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
index edc4087f169c4ad951b9ae8b898a6ce682e42bd0..2908600995dbe0cb0960decd8b49d738fa9f7083 100644
--- a/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
@@ -325,6 +325,7 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
 		tools.setElementCssClass("o_sel_repository_tools");
 		tools.setIconCSS("o_icon o_icon_tools");
 		
+		initRole();
 		initToolbar(tools);
 		
 		if(tools.size() > 0) {
@@ -339,8 +340,6 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
 			toolbarPanel.addTool(status, Align.left, false);
 		}
 		
-		initRole();
-
 		toolbarPanel.setDirty(true);
 	}
 
@@ -409,7 +408,7 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
 			rolesDropdown.addComponent(ownerLink);
 		}
 		if (rolesDropdown.size() > 0) {
-			toolbarPanel.addTool(rolesDropdown, Align.left);
+			toolbarPanel.addTool(rolesDropdown, Align.right);
 		}
 	}