diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
index 7b11ee3983f1cc00cededc750f39c2fcfaaf14c3..1a7d20962561c43df6c2f0f3b934928723125c0a 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
@@ -186,6 +186,11 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
 
 	@Override
 	public void setRendererType(FlexiTableRendererType rendererType) {
+		// activate active render button
+		customTypeButton.setActive(FlexiTableRendererType.custom == rendererType);
+		classicTypeButton.setActive(FlexiTableRendererType.classic == rendererType);
+		dataTablesTypeButton.setActive(FlexiTableRendererType.dataTables == rendererType);
+		// update render type
 		this.rendererType = rendererType;
 		if(component != null) {
 			component.setDirty(true);
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
index 0e641903637dfd29737b450404d98d2006cafde6..54b551597e2aa4c489bf2abca3689902699b7c46 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
@@ -163,8 +163,8 @@ public class RepositoryEntryListController extends FormBasicController
 
 		model = new RepositoryEntryDataModel(dataSource, columnsModel);
 		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 20, true, getTranslator(), formLayout);
-		tableEl.setRendererType(FlexiTableRendererType.custom);
 		tableEl.setAvailableRendererTypes(FlexiTableRendererType.custom, FlexiTableRendererType.classic);
+		tableEl.setRendererType(FlexiTableRendererType.custom);
 		tableEl.setSearchEnabled(true);
 		tableEl.setCustomizeColumns(false);
 		tableEl.setElementCssClass("o_coursetable o_rendertype_custom");