diff --git a/src/editors/containers/TextEditor/pluginConfig.js b/src/editors/containers/TextEditor/pluginConfig.js
index 3670225c4..ba880789b 100644
--- a/src/editors/containers/TextEditor/pluginConfig.js
+++ b/src/editors/containers/TextEditor/pluginConfig.js
@@ -21,7 +21,7 @@ export default StrictDict({
   toolbar: mapToolbars([
     [buttons.undo, buttons.redo],
     [buttons.formatSelect],
-    [buttons.bold, buttons.italic, buttons.foreColor, buttons.backColor],
+    [buttons.bold, buttons.italic, buttons.underline, buttons.foreColor, buttons.backColor],
     [
       buttons.align.left,
       buttons.align.center,
diff --git a/src/editors/data/constants/tinyMCE.js b/src/editors/data/constants/tinyMCE.js
index 308c06237..70732f092 100644
--- a/src/editors/data/constants/tinyMCE.js
+++ b/src/editors/data/constants/tinyMCE.js
@@ -48,6 +48,7 @@ export const buttons = StrictDict({
   }),
   table: 'table',
   undo: 'undo',
+  underline: 'underline',
 });
 
 export const plugins = listKeyStore([