diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 10db9ec13d..71656e2804 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -21,3 +21,5 @@
 .right-icon a {color: #1183fb;}
 .cell th,td {word-break: break-word;}
 .main-actions {width: 100% !important;}
+.main-col .editor-preview {background: #fff}
+.main-col .CodeMirror{border: none}
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index bae9b530a2..14d3f0e80a 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -114,6 +114,10 @@ js::set('docID', $doc->id);
                   echo "</div></div>";
               }
           }
+          elseif($doc->contentType == 'markdown')
+          {
+              echo "<textarea id='markdownContent' /></textarea>";
+          }
           else
           {
               echo $doc->content;
@@ -237,4 +241,19 @@ js::set('docID', $doc->id);
 </div>
 <?php js::set('canDeleteFile', common::hasPriv('doc', 'deleteFile'));?>
 <?php include '../../common/view/syntaxhighlighter.html.php';?>
+<?php if($doc->contentType == 'markdown'):?>
+<?php css::import($jsRoot . "markdown/simplemde.min.css");?>
+<?php js::import($jsRoot . 'markdown/simplemde.min.js'); ?>
+<?php js::set('markdownText', $doc->content);?>
+<script>
+$(function()
+{
+    var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false});
+    simplemde.value(markdownText);
+    simplemde.togglePreview();
+
+    $('#content .CodeMirror .editor-preview a').attr('target', '_blank');
+})
+</script>
+<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>