diff --git a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/constants.js b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/constants.js
index 5b8046a4e6..7ccc298a3e 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/constants.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/constants.js
@@ -27,7 +27,7 @@ export const NEW_CONTROLS = [
   [
     {label: 'B', style: 'BOLD', handler: 'addEntity', text: '**innerText**' },
     {label: 'I', style: 'ITALIC', className: 'styleButtonItalic', handler: 'addEntity', text: '*innerText*' },
-    {label: 'U', style: 'UNDERLINE', handler: 'addEntity', text: '<u>innerText</u>' },
+    {label: 'U', style: 'UNDERLINE', handler: 'addEntity', text: '__innerText__' },
     {label: 'UL', style: 'unordered-list-item', className: 'styleButtonUL', hideLabel: true, handler: 'addEntity', text: '- innerText' },
     {label: 'OL', style: 'ordered-list-item', className: 'styleButtonOL', hideLabel: true, handler: 'addEntity', text: '1. innerText' },
   ],
@@ -40,5 +40,5 @@ export const NEW_CONTROLS = [
 ];
 
 
-export const END_REPLACER = '*</u>`](link)';
-export const START_REPLACER = '*<u>-`>#[ ![ 1. ';
+export const END_REPLACER = '_*</u>`](link)';
+export const START_REPLACER = '_*<u>-`>#[ ![ 1. ';
diff --git a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/helpers.js b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/helpers.js
index d4b94a9980..f3a6b68c4b 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/helpers.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/helpers.js
@@ -27,7 +27,7 @@ export function getInnerText(style) {
       innerText = '*text in italic*';
       break;
     case 'UNDERLINE':
-      innerText = '<u>text underlined</u>';
+      innerText = '__text underlined__';
       break;
     case 'H1':
       innerText = '# ';