diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index e9ff08725..9d171f68c 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -354,7 +354,6 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 				var titleEl = this.find(':header:first');
 				this.getDialog().attr('title', titleEl.text());
 
-				this.setEditor(ss.editorWrappers['default']());
 				this._super();
 
 				this.redraw();
@@ -378,6 +377,19 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 			updateFromEditor: function() {
 				this.getEditor().onopen();
 				window._ss_htmleditorfield_bookmark = this.getEditor().createBookmark();
+			},
+			createEditor: function(){
+				return ss.editorWrappers['default']();
+			},
+			/**
+			 * Get the tinyMCE editor
+			 */
+			getEditor: function(){
+				var val = this._super();
+				if(!val) {
+					this.setEditor(val = this.createEditor());
+				}
+				return val;
 			}
 		});