diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js
index 7b20e35fb256b..c1905cee6a781 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js
@@ -403,7 +403,8 @@ define([
             jQuery('.tox-tinymce-aux').hide();
 
             require(['mage/adminhtml/browser'], function () {
-                MediabrowserUtility.openDialog(wUrl, false, false, typeTitle, {
+                MediabrowserUtility.openDialog(wUrl, false, false, typeTitle,
+                    {
                         /**
                          * Closed.
                          */
@@ -674,6 +675,10 @@ define([
 
                 // process tag attributes string
                 attributesString = attributesString.gsub(/([a-z0-9\-\_]+)="(.*?)(\{\{.+?\}\})(.*?)"/i, function (m) {
+                    if (/\{\{config path=\"([^\"]+)\"\}\}/i.test(m[3].replace(/"/g, '"'))) {
+                        return m[1] + '="' + m[2] + m[3].replace(/\"/g,'"') + m[4] + '"';
+                    }
+                    
                     decodedDirectiveString = encodeURIComponent(Base64.mageEncode(m[3].replace(/"/g, '"') + m[4]));
 
                     return m[1] + '="' + m[2] + this.makeDirectiveUrl(decodedDirectiveString) + '"';