diff --git a/media/com_menus/js/admin-items-modal.js b/media/com_menus/js/admin-items-modal.js
index 65d7770071a86..5623f5cb5d17f 100644
--- a/media/com_menus/js/admin-items-modal.js
+++ b/media/com_menus/js/admin-items-modal.js
@@ -32,7 +32,11 @@
 
 		/** Use the API, if editor supports it **/
 		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
-			window.parent.Joomla.editors.instances[editor].replaceSelection(tag)
+			if (typeof window.parent.Joomla.editors.instances[editor]['getSelection'] !== 'undefined' && window.parent.Joomla.editors.instances[editor].getSelection()) {
+				window.parent.Joomla.editors.instances[editor].replaceSelection('<a href=\"' + uri + thislang + lang + '">' + window.parent.Joomla.editors.instances[editor].getSelection() + '</a>');
+			} else {
+				window.parent.Joomla.editors.instances[editor].replaceSelection(tag)
+			}
 		} else {
 			window.parent.jInsertEditorText(tag, editor);
 		}
diff --git a/media/com_menus/js/admin-items-modal.min.js b/media/com_menus/js/admin-items-modal.min.js
index 6a88337fb3b15..e3f2283dd7444 100644
--- a/media/com_menus/js/admin-items-modal.min.js
+++ b/media/com_menus/js/admin-items-modal.min.js
@@ -1 +1 @@
-!function(){"use strict";window.jSelectMenuItem=function(a,b,c,d,e,f){var h,i,g="";return Joomla.getOptions("xtd-menus")?(i=Joomla.getOptions("xtd-menus").editor,""!==f&&(g="&lang="),h='<a href="'+c+g+f+'">'+b+"</a>",window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(i)?window.parent.Joomla.editors.instances[i].replaceSelection(h):window.parent.jInsertEditorText(h,i),void window.parent.jModalClose()):(window.parent.jModalClose(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectMenuItem"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-uri"),null,null,a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
+!function(){"use strict";window.jSelectMenuItem=function(t,e,n,a,o,i){var r,d,l="";if(!Joomla.getOptions("xtd-menus"))return window.parent.jModalClose(),!1;d=Joomla.getOptions("xtd-menus").editor,""!==i&&(l="&lang="),r='<a href="'+n+l+i+'">'+e+"</a>",window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(d)?void 0!==window.parent.Joomla.editors.instances[d].getSelection&&window.parent.Joomla.editors.instances[d].getSelection()?window.parent.Joomla.editors.instances[d].replaceSelection('<a href="'+n+l+i+'">'+window.parent.Joomla.editors.instances[d].getSelection()+"</a>"):window.parent.Joomla.editors.instances[d].replaceSelection(r):window.parent.jInsertEditorText(r,d),window.parent.jModalClose()},document.addEventListener("DOMContentLoaded",function(){for(var t=document.querySelectorAll(".select-link"),e=0,n=t.length;e<n;e++)t[e].addEventListener("click",function(t){t.preventDefault();var e=t.target.getAttribute("data-function");"jSelectMenuItem"===e?window[e](t.target.getAttribute("data-id"),t.target.getAttribute("data-title"),t.target.getAttribute("data-uri"),null,null,t.target.getAttribute("data-language")):window.parent[e](t.target.getAttribute("data-id"),t.target.getAttribute("data-title"),null,null,t.target.getAttribute("data-uri"),t.target.getAttribute("data-language"),null)})})}();
diff --git a/media/editors/none/js/none.js b/media/editors/none/js/none.js
index d2611b26634d8..e587f44c89d45 100644
--- a/media/editors/none/js/none.js
+++ b/media/editors/none/js/none.js
@@ -14,18 +14,29 @@
 			myField.focus();
 			var sel = document.selection.createRange();
 			sel.text = myValue;
-		} else if (myField.selectionStart || myField.selectionStart == '0') {
+		} else if (myField.selectionStart || myField.selectionStart === 0) {
 			// MOZILLA/NETSCAPE support
-			var startPos = myField.selectionStart;
-			var endPos = myField.selectionEnd;
-			myField.value = myField.value.substring(0, startPos)
+			myField.value = myField.value.substring(0, myField.selectionStart)
 				+ myValue
-				+ myField.value.substring(endPos, myField.value.length);
+				+ myField.value.substring(myField.selectionEnd, myField.value.length);
 		} else {
 			myField.value += myValue;
 		}
 	}
 
+	function getSelection(myField) {
+		if (document.selection) {
+			// IE support
+			myField.focus();
+			return document.selection.createRange();
+		} else if (myField.selectionStart || myField.selectionStart === 0) {
+			// MOZILLA/NETSCAPE support
+			return myField.value.substring(myField.selectionStart, myField.selectionEnd);
+		} else {
+			return myField.value;
+		}
+	}
+
 	// @deprecated 4.0 Use directly Joomla.editors.instances[editor].replaceSelection(text);
 	window.jInsertEditorText = function(text, editor) {
 		Joomla.editors.instances[editor].replaceSelection(text);
@@ -41,9 +52,10 @@
 				'element':  editors[i].childNodes[0],
 				'getValue': function () { return this.element.value; },
 				'setValue': function (text) { return this.element.value = text; },
+				'getSelection': function () { return getSelection(this.element); },
 				'replaceSelection': function (text) { return insertAtCursor(this.element, text); },
 				'onSave': function() { return ''; }
 			};
 		}
 	});
-}(Joomla, window, document));
\ No newline at end of file
+}(Joomla, window, document));
diff --git a/media/editors/none/js/none.min.js b/media/editors/none/js/none.min.js
index 3841593fa87d9..a64c65918a098 100644
--- a/media/editors/none/js/none.min.js
+++ b/media/editors/none/js/none.min.js
@@ -1 +1 @@
-!function(a,b,c){function d(a,b){if(c.selection){a.focus();var d=c.selection.createRange();d.text=b}else if(a.selectionStart||"0"==a.selectionStart){var e=a.selectionStart,f=a.selectionEnd;a.value=a.value.substring(0,e)+b+a.value.substring(f,a.value.length)}else a.value+=b}b.jInsertEditorText=function(a,b){d(c.getElementById(b),a)},c.addEventListener("DOMContentLoaded",function(){for(var b=c.querySelectorAll(".js-editor-none"),e=0,f=b.length;e<f;e++)a.editors.instances[b[e].childNodes[0].id]={id:b[e].childNodes[0].id,element:b[e].childNodes[0],getValue:function(){return this.element.value},setValue:function(a){return this.element.value=a},replaceSelection:function(a){return d(this.element,a)},onSave:function(){return""}}})}(Joomla,window,document);
\ No newline at end of file
+!function(i,e,o){e.jInsertEditorText=function(e,t){i.editors.instances[t].replaceSelection(e)},o.addEventListener("DOMContentLoaded",function(){for(var e=o.querySelectorAll(".js-editor-none"),t=0,n=e.length;t<n;t++)i.editors.instances[e[t].childNodes[0].id]={id:e[t].childNodes[0].id,element:e[t].childNodes[0],getValue:function(){return this.element.value},setValue:function(e){return this.element.value=e},getSelection:function(){return e=this.element,o.selection?(e.focus(),o.selection.createRange()):e.selectionStart||0===e.selectionStart?e.value.substring(e.selectionStart,e.selectionEnd):e.value;var e},replaceSelection:function(e){return t=this.element,n=e,void(o.selection?(t.focus(),o.selection.createRange().text=n):t.selectionStart||0===t.selectionStart?t.value=t.value.substring(0,t.selectionStart)+n+t.value.substring(t.selectionEnd,t.value.length):t.value+=n);var t,n},onSave:function(){return""}}})}(Joomla,window,document);
diff --git a/media/editors/tinymce/js/tinymce.js b/media/editors/tinymce/js/tinymce.js
index 159c834677a24..8a04fb7dde5b4 100644
--- a/media/editors/tinymce/js/tinymce.js
+++ b/media/editors/tinymce/js/tinymce.js
@@ -84,6 +84,7 @@
 				// Required by Joomla's API for the XTD-Buttons
 				'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); },
 				// Some extra instance dependent
 				'id': element.id,
diff --git a/media/editors/tinymce/js/tinymce.min.js b/media/editors/tinymce/js/tinymce.min.js
index 91725b1078ed1..4dd636a871c7b 100644
--- a/media/editors/tinymce/js/tinymce.min.js
+++ b/media/editors/tinymce/js/tinymce.min.js
@@ -1 +1 @@
-(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(/\[\]|\]/g,"").split("[").pop():"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)},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
+!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);
diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
index 9300a3bca1f37..f0e1699bee6cc 100644
--- a/media/system/js/core-uncompressed.js
+++ b/media/system/js/core-uncompressed.js
@@ -20,6 +20,8 @@ Joomla.editors.instances = Joomla.editors.instances || {
 	 *                                  Example: function () { return this.element.value; }
 	 * setValue         Type  Function  Should replace the complete data of the editor
 	 *                                  Example: function (text) { return this.element.value = text; }
+	 * getSelection     Type  Function  Should return the selected text from the editor
+	 *                                  Example: function () { return this.selectedText; }
 	 * replaceSelection Type  Function  Should replace the selected text of the editor
 	 *                                  If nothing selected, will insert the data at the cursor
 	 *                                  Example: function (text) { return insertAtCursor(this.element, text); }