diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java
index a59efe0b7ecd20f19fe625d63524f5f0562b51c3..df4cefa8bef6899de45e91df4048eb45136e28a0 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java
@@ -168,6 +168,8 @@ class RichTextElementRenderer implements ComponentRenderer {
 			// some special code to find out when the element is dirty. See the comments
 			// BTinyHelpers.js
 			sb.append("});");
+			sb.append("tinyMCE.get('").append(domID).append("').focus();");
+
 			
 			sb.append("} };");
 			sb.append(checkAndLoadTinyFunctionName).append("();");
diff --git a/src/main/webapp/static/js/tinymce/BTinyHelper.js b/src/main/webapp/static/js/tinymce/BTinyHelper.js
index 4cfdba4bae16262a66cb70fb069f0a50ae99655f..b431abdd4028448ac43875f2da91800e6c6f6d29 100644
--- a/src/main/webapp/static/js/tinymce/BTinyHelper.js
+++ b/src/main/webapp/static/js/tinymce/BTinyHelper.js
@@ -112,8 +112,8 @@ var BTinyHelper = {
 		var newExecutor = jQuery.periodic({period: 500, decay:1.0, max_period: Number.MAX_VALUE}, function(executor) {
 			// first check if the html editor still exists on this page, otherwhise stop executing this code
 			var elem = jQuery('#' + elementId);
-			if (!elem) {
-				executor.cancel();
+			if (elem.length == 0) {
+				newExecutor.cancel();
 				BTinyHelper.formDirtyObservers.remove(observerKey);
 				return;
 			}