diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
index bcacb0263c9aad00a0c0df8e40cbe6c5c7ed5a67..fa31111635b800fb997b176a2b341d819169ecf0 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextConfiguration.java
@@ -390,7 +390,8 @@ public class RichTextConfiguration implements Disposable {
 		plugins.add(SAFARI_PLUGIN);
 		// Start observing of diry richt text element and trigger calling of setFlexiFormDirty() method
 		// This check is initialized after the editor has fully loaded
-		addOnInitCallbackFunction(ONINIT_CALLBACK_VALUE_START_DIRTY_OBSERVER + ".curry('" + rootFormDispatchId + "','" + domID + "')");
+		addOnInitCallbackFunction(ONINIT_CALLBACK_VALUE_START_DIRTY_OBSERVER + "('" + rootFormDispatchId + "','" + domID + "')");
+		addOnInitCallbackFunction("tinyMCE.get('" + domID + "').focus()");
 	}
 
 	/**
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 df4cefa8bef6899de45e91df4048eb45136e28a0..c70981afea58f94708e8fff2bf29afd4c8e7e5f9 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,7 +168,6 @@ 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("} };");