diff --git a/lib/editor/tinymce/module.js b/lib/editor/tinymce/module.js
index b86da9d8406..d3118ef0f33 100644
--- a/lib/editor/tinymce/module.js
+++ b/lib/editor/tinymce/module.js
@@ -43,6 +43,8 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
         };
 
         M.editor_tinymce.initialised = true;
+        M.util.js_pending('editors');
+        options.oninit = "M.editor_tinymce.init_callback";
     }
 
     M.editor_tinymce.editor_options[editorid] = options;
@@ -86,6 +88,10 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
     }
 };
 
+M.editor_tinymce.init_callback = function() {
+    M.util.js_complete('editors');
+}
+
 M.editor_tinymce.init_filepicker = function(Y, editorid, options) {
     M.editor_tinymce.filepicker_options[editorid] = options;
 };