diff --git a/media/editors/tinymce/js/tinymce.js b/media/editors/tinymce/js/tinymce.js
index ebe616865e79e..3fb33a358727e 100644
--- a/media/editors/tinymce/js/tinymce.js
+++ b/media/editors/tinymce/js/tinymce.js
@@ -44,7 +44,7 @@
 		 * @since 3.7.0
 		 */
 		setupEditor: function ( element, pluginOptions ) {
-			var name = element ? element.getAttribute('name').replace(/\[\]|\]/g, '').split('[').pop() : 'default', // Get Editor name
+			var name = element ? element.getAttribute('name').replace(/[^A-Za-z0-9_]+/g, '_') : 'default', // Get Editor name
 			    tinyMCEOptions = pluginOptions ? pluginOptions.tinyMCE || {} : {},
 			    defaultOptions = tinyMCEOptions['default'] || {},
 			    options = tinyMCEOptions[name] ? tinyMCEOptions[name] : defaultOptions; // Check specific options by the name
diff --git a/media/editors/tinymce/js/tinymce.min.js b/media/editors/tinymce/js/tinymce.min.js
index 4dd636a871c7b..3299ad278558f 100644
--- a/media/editors/tinymce/js/tinymce.min.js
+++ b/media/editors/tinymce/js/tinymce.min.js
@@ -1 +1 @@
-!function(u,l,t,c){"use strict";t.getSize=t.getSize||function(){return{x:t.innerWidth,y:t.innerHeight}},t.jInsertEditorText=function(t,e){l.editors.instances[e].replaceSelection(t)};var e={setupEditors:function(t){t=t||c;for(var e=l.getOptions?l.getOptions("plg_editor_tinymce",{}):l.optionsStorage.plg_editor_tinymce||{},n=t.querySelectorAll(".js-editor-tinymce"),i=0,o=n.length;i<o;i++){var r=n[i].querySelector("textarea");this.setupEditor(r,e)}},setupEditor:function(t,e){var n=t?t.getAttribute("name").replace(/\[\]|\]/g,"").split("[").pop():"default",i=e&&e.tinyMCE||{},o=i.default||{},r=i[n]?i[n]:o;if(r=r.joomlaMergeDefaults?l.extend(l.extend({},o),r):l.extend({},r),t&&(r.selector=null,r.target=t),r.joomlaExtButtons&&r.joomlaExtButtons.names&&r.joomlaExtButtons.names.length){r.toolbar1+=" | "+r.joomlaExtButtons.names.join(" ");var s=r.joomlaExtButtons.script.join(";");r.setupCallbackString=r.setupCallbackString||"",r.setupCallbackString=r.setupCallbackString+";"+s,r.joomlaExtButtons=null}r.setupCallbackString&&!r.setup&&(r.setup=new Function("editor",r.setupCallbackString));var a=new u.Editor(t.id,r,tinymce.EditorManager);a.render(),l.editors.instances[t.id]={getValue:function(){return this.instance.getContent()},setValue:function(t){return this.instance.setContent(t)},getSelection:function(){return this.instance.selection.getContent({format:"text"})},replaceSelection:function(t){return this.instance.execCommand("mceInsertContent",!1,t)},id:t.id,instance:a,onSave:function(){return this.instance.isHidden()&&this.instance.show(),""}},c.getElementById(a.id).form.addEventListener("submit",function(){l.editors.instances[a.targetElm.id].onSave()})}};l.JoomlaTinyMCE=e,c.addEventListener("DOMContentLoaded",function(){l.JoomlaTinyMCE.setupEditors(),t.jQuery&&jQuery(c).on("subform-row-add",function(t,e){l.JoomlaTinyMCE.setupEditors(e)})})}(tinyMCE,Joomla,window,document);
+(function(tinyMCE,Joomla,window,document){"use strict";window.getSize=window.getSize||function(){return{x:window.innerWidth,y:window.innerHeight}};window.jInsertEditorText=function(text,editor){Joomla.editors.instances[editor].replaceSelection(text)};var JoomlaTinyMCE={setupEditors:function(target){target=target||document;var pluginOptions=Joomla.getOptions?Joomla.getOptions("plg_editor_tinymce",{}):Joomla.optionsStorage.plg_editor_tinymce||{},editors=target.querySelectorAll(".js-editor-tinymce");for(var i=0,l=editors.length;i<l;i++){var editor=editors[i].querySelector("textarea");this.setupEditor(editor,pluginOptions)}},setupEditor:function(element,pluginOptions){var name=element?element.getAttribute("name").replace(/[^A-Za-z0-9_]+/g,"_"):"default",tinyMCEOptions=pluginOptions?pluginOptions.tinyMCE||{}:{},defaultOptions=tinyMCEOptions["default"]||{},options=tinyMCEOptions[name]?tinyMCEOptions[name]:defaultOptions;if(options.joomlaMergeDefaults){options=Joomla.extend(Joomla.extend({},defaultOptions),options)}else{options=Joomla.extend({},options)}if(element){options.selector=null;options.target=element}if(options.joomlaExtButtons&&options.joomlaExtButtons.names&&options.joomlaExtButtons.names.length){options.toolbar1+=" | "+options.joomlaExtButtons.names.join(" ");var callbackString=options.joomlaExtButtons.script.join(";");options.setupCallbackString=options.setupCallbackString||"";options.setupCallbackString=options.setupCallbackString+";"+callbackString;options.joomlaExtButtons=null}if(options.setupCallbackString&&!options.setup){options.setup=new Function("editor",options.setupCallbackString)}var ed=new tinyMCE.Editor(element.id,options,tinymce.EditorManager);ed.render();Joomla.editors.instances[element.id]={getValue:function(){return this.instance.getContent()},setValue:function(text){return this.instance.setContent(text)},getSelection:function(){return this.instance.selection.getContent({format:"text"})},replaceSelection:function(text){return this.instance.execCommand("mceInsertContent",false,text)},id:element.id,instance:ed,onSave:function(){if(this.instance.isHidden()){this.instance.show()}return""}};document.getElementById(ed.id).form.addEventListener("submit",function(){Joomla.editors.instances[ed.targetElm.id].onSave()})}};Joomla.JoomlaTinyMCE=JoomlaTinyMCE;document.addEventListener("DOMContentLoaded",function(){Joomla.JoomlaTinyMCE.setupEditors();if(window.jQuery){jQuery(document).on("subform-row-add",function(event,row){Joomla.JoomlaTinyMCE.setupEditors(row)})}})})(tinyMCE,Joomla,window,document);
\ No newline at end of file
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 1609c126674ab..68bb665cd8313 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -159,10 +159,9 @@ public function onDisplay(
 			$id = $name;
 		}
 
-		$id            = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id);
-		$nameGroup     = explode('[', preg_replace('/\[\]|\]/', '', $name));
-		$fieldName     = end($nameGroup);
-		$scriptOptions = array();
+		$id              = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id);
+		$parsedFieldName = preg_replace('/[^A-Za-z0-9_]+/', '_', $name);
+		$scriptOptions   = array();
 
 		// Check for existing options
 		$doc     = JFactory::getDocument();
@@ -200,7 +199,7 @@ public function onDisplay(
 		$editor .= '</div>';
 
 		// Prepare the instance specific options, actually the ext-buttons
-		if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons']))
+		if (empty($options['tinyMCE'][$parsedFieldName]['joomlaExtButtons']))
 		{
 			$btns = $this->tinyButtons($id, $buttons);
 
@@ -212,11 +211,11 @@ public function onDisplay(
 			// Set editor to readonly mode
 			if (!empty($params['readonly']))
 			{
-				$options['tinyMCE'][$fieldName]['readonly'] = 1;
+				$options['tinyMCE'][$parsedFieldName]['readonly'] = 1;
 			}
 
-			$options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true;
-			$options['tinyMCE'][$fieldName]['joomlaExtButtons']    = $btns;
+			$options['tinyMCE'][$parsedFieldName]['joomlaMergeDefaults'] = true;
+			$options['tinyMCE'][$parsedFieldName]['joomlaExtButtons']    = $btns;
 
 			$doc->addScriptOptions('plg_editor_tinymce', $options, false);
 		}