diff --git a/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_content/autocomplete.html b/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_content/autocomplete.html
index 4017379ea20d73f04d0ac93d651152254e3ee8af..506d2e057f9e3bd59009de3c84158957f5e9a733 100644
--- a/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_content/autocomplete.html
+++ b/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_content/autocomplete.html
@@ -68,6 +68,14 @@ jQuery(function(){
 	}).on('typeahead:change', function(e, value) {
 		$r.openJavaScriptCommand("change"),'key','',
 			'$r.getId("o_autocomplete_input")',jQuery('#$r.getId("o_autocomplete_input")').val());
+	}).on('keypress', function(e) {
+		var keyCode = e.keyCode || e.which;
+		if (keyCode === 13) {
+			e.preventDefault();
+			e.target.blur();
+			jQuery(e.target).typeahead('close');
+			return false;
+		}
 	});
 });
 /* ]]> */