diff --git a/src/main/java/org/olat/course/assessment/ui/ChooseElementsController.java b/src/main/java/org/olat/course/assessment/ui/ChooseElementsController.java
index 34e37e4139f1b97bea0565990c607e9c33353451..882f4cbe052b341cc94f88b9926449b6842bd388 100644
--- a/src/main/java/org/olat/course/assessment/ui/ChooseElementsController.java
+++ b/src/main/java/org/olat/course/assessment/ui/ChooseElementsController.java
@@ -117,9 +117,9 @@ public class ChooseElementsController extends FormBasicController {
 	@Override
 	protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
 		if(selectAll == source) {
-			
+			selectTree.selectAll();
 		} else if(deselectAll == source) {
-			
+			selectTree.deselectAll();
 		}
 		super.formInnerEvent(ureq, source, event);
 	}
diff --git a/src/main/java/org/olat/course/assessment/ui/_content/choose_elements.html b/src/main/java/org/olat/course/assessment/ui/_content/choose_elements.html
index 758b234ea44d1ade3f12943a4e381f3e59e8596d..1541fa0d443768ea37ff3365e4a1814f56bb73e9 100644
--- a/src/main/java/org/olat/course/assessment/ui/_content/choose_elements.html
+++ b/src/main/java/org/olat/course/assessment/ui/_content/choose_elements.html
@@ -1,7 +1,7 @@
 #if($elementNames && $elementNames.size() > 0)
 	$r.translate("elements"):
 	#foreach($elementName in $elementNames)
-		<span>$elementName</span>
+		<span>#if($elementNames.indexOf($elementName) > 0), #end$elementName</span>
 	#end
 	<br/>
 #end