diff --git a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdCreateFile.java b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdCreateFile.java
index 3bd3ac39087a39259fbaaa44bbc9dab94236f63c..3a9b7130bd0435c0c4f53a3184c89dd34f2b2df7 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdCreateFile.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdCreateFile.java
@@ -229,10 +229,10 @@ public class CmdCreateFile extends FormBasicController implements FolderCommand
 				isInputValid = false;
 				return isInputValid;
 			} else if (!fileName.endsWith(".html") && !fileName.endsWith(".htm") && !fileName.endsWith(".txt") && !fileName.endsWith(".css")) {
-      //add html extension if missing
+				//add html extension if missing
 				fileName = fileName + ".html";
 			}
-      //ok, file name is sanitized, let's see if a file with this name already exists
+			//ok, file name is sanitized, let's see if a file with this name already exists
 			VFSContainer currentContainer = folderComponent.getCurrentContainer();
 			VFSItem item = currentContainer.resolve(fileName);
 			if (item != null) {
@@ -240,6 +240,7 @@ public class CmdCreateFile extends FormBasicController implements FolderCommand
 				isInputValid = false;
 			} else {
 				isInputValid = true;
+				textElement.setValue(fileName);
 			}
 		}
 		return isInputValid;			
diff --git a/src/main/java/org/olat/core/commons/services/commentAndRating/ui/UserCommentsController.java b/src/main/java/org/olat/core/commons/services/commentAndRating/ui/UserCommentsController.java
index 92cd4581f41cea8e43aa1b04bc7d5c2deec95b64..4dd192e67548ad4930c58bce427f97aaf64e8a32 100644
--- a/src/main/java/org/olat/core/commons/services/commentAndRating/ui/UserCommentsController.java
+++ b/src/main/java/org/olat/core/commons/services/commentAndRating/ui/UserCommentsController.java
@@ -113,6 +113,10 @@ public class UserCommentsController extends BasicController {
 	public void setUserObject(Object userObject) {
 		this.userObject = userObject;
 	}
+	
+	public int getNumOfComments() {
+		return commentControllers == null ? 0 : commentControllers.size();
+	}
 
 	/**
 	 * @see org.olat.core.gui.control.DefaultController#doDispose()
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
index fa2f17531b4409c8b3280209607bc48f448625e5..f7b4c1b5082511aca29c1746db2003344a4c2bcb 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
@@ -451,15 +451,26 @@ public class RepositoryEntryDetailsController extends FormBasicController {
 	protected void event(UserRequest ureq, Controller source, Event event) {
 		if(commentsCtrl == source) {
 			if(event == Event.CANCELLED_EVENT) {
+				updateComments(commentsCtrl.getNumOfComments());
 				cmc.deactivate();
 				cleanUp();
 			}
 		} else if(cmc == source) {
+			if(commentsCtrl != null) {
+				updateComments(commentsCtrl.getNumOfComments());
+			}
 			cleanUp();
 		}
 		super.event(ureq, source, event);
 	}
 	
+	private void updateComments(int numOfComments) {
+		String title = "(" + numOfComments + ")";
+		commentsLink.setI18nKey(title);
+		String css = numOfComments > 0 ? "o_icon o_icon_comments o_icon-lg" : "o_icon o_icon_comments_none o_icon-lg";
+		commentsLink.setIconLeftCSS(css);
+	}
+	
 	private void cleanUp() {
 		removeAsListenerAndDispose(commentsCtrl);
 		removeAsListenerAndDispose(cmc);