diff --git a/config/assets/default.js b/config/assets/default.js
index 2b36d3b4..3439a2b5 100644
--- a/config/assets/default.js
+++ b/config/assets/default.js
@@ -85,6 +85,7 @@ module.exports = {
         'public/lib/codemirror/lib/codemirror.js',
         'public/lib/angular-ui-codemirror/ui-codemirror.js',
         'public/lib/codemirror/mode/javascript/javascript.js',
+        'public/lib/codemirror/mode/markdown/markdown.js',
         //angular-lazy-img
         'public/lib/angular-lazy-img/release/angular-lazy-img.js'
 
diff --git a/config/assets/production.js b/config/assets/production.js
index a402c404..0768f09a 100644
--- a/config/assets/production.js
+++ b/config/assets/production.js
@@ -85,6 +85,7 @@ module.exports = {
         'public/lib/codemirror/lib/codemirror.js',
         'public/lib/angular-ui-codemirror/ui-codemirror.min.js',
         'public/lib/codemirror/mode/javascript/javascript.js',
+        'public/lib/codemirror/mode/markdown/markdown.js',
         //angular-lazy-img
         'public/lib/angular-lazy-img/release/angular-lazy-img.min.js'
 
diff --git a/modules/systems/client/controllers/systems-config.client.controller.js b/modules/systems/client/controllers/systems-config.client.controller.js
index 850b32da..3462fd92 100644
--- a/modules/systems/client/controllers/systems-config.client.controller.js
+++ b/modules/systems/client/controllers/systems-config.client.controller.js
@@ -20,9 +20,11 @@
      * @type {{lineNumbers: boolean, tabSize: number, onLoad: SystemConfigController.cmOption.onLoad}}
      */
     vm.cmOption = {
-      lineNumbers: true,
-      tabSize: 2,
       onLoad: function (_cm) {
+        _cm.setOption('lineNumbers', true);
+        _cm.setOption('tabSize', 2);
+        _cm.setOption('gutters', ['CodeMirror-lint-markers', 'CodeMirror-linenumbers']);
+        _cm.setOption('lint', true);
         /**
          * initConfigContent
          * @param value
@@ -98,10 +100,11 @@
      * @type {{lineNumbers: boolean, tabSize: number, readOnly: boolean, onLoad: SystemConfigController.cmdOption.onLoad}}
      */
     vm.cmdOption = {
-      lineNumbers: true,
-      tabSize: 2,
-      readOnly: true,
       onLoad: function (_cm) {
+        _cm.setOption('lineNumbers', true);
+        _cm.setOption('tabSize', 2);
+        _cm.setOption('readOnly', true);
+
         $('.CodeMirror').css('height', '0');
 
         /**