diff --git a/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java b/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java
index ba7d4d92b5ded31c8627b4552a9a1e5e36153888..cb171f5f300b8ddeb86beab80e3c0a220df8a6db 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java
@@ -387,11 +387,12 @@ public class FolderRunController extends BasicController implements Activateable
 			
 			folderCommand = FolderCommandFactory.getInstance().getCommand(cmd, ureq, getWindowControl());
 			if (folderCommand != null) {
-				folderCommandController = folderCommand.execute(folderComponent, ureq, getWindowControl(), getTranslator());
-				if (folderCommandController != null) {
+				Controller commandController = folderCommand.execute(folderComponent, ureq, getWindowControl(), getTranslator());
+				if (commandController != null) {
+					folderCommandController = commandController;
 					// activate command's controller
-					this.listenTo(folderCommandController);
-					if ( ! folderCommand.runsModal()) {
+					listenTo(folderCommandController);
+					if (!folderCommand.runsModal()) {
 						cmc = new CloseableModalController(getWindowControl(), translate("close"), folderCommandController.getInitialComponent());
 						cmc.activate();						
 						listenTo(cmc);