diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index 3ee066a1f..f1a2ac5c0 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -134,6 +134,12 @@ class WikiController extends ControllerBase {
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
   
+  post("/:owner/:repository/wiki/_preview"){
+    val content = params("content")
+    contentType = "text/html"
+    view.helpers.markdown(content)
+  }
+  
   /**
    * Constraint for the wiki page name.
    */
diff --git a/src/main/twirl/wiki/wikiedit.scala.html b/src/main/twirl/wiki/wikiedit.scala.html
index da6fc0b68..0080f356e 100644
--- a/src/main/twirl/wiki/wikiedit.scala.html
+++ b/src/main/twirl/wiki/wikiedit.scala.html
@@ -29,7 +29,7 @@
           <span id="error-pageName" class="error-message"></span>
           <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
           <span id="error-content" class="error-message"></span>
-          <textarea name="content" style="width: 900px; height: 400px;">@page.map(_.content)</textarea>
+          <textarea id="content" name="content" style="width: 900px; height: 400px;">@page.map(_.content)</textarea>
           <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
           <input type="hidden" name="currentPageName" value="@pageName"/>
         </div>
@@ -46,7 +46,11 @@
 <script>
 $(function(){
   $('#preview').click(function(){
-    $('#preview-area').html('<h1>xxxxx</h1>');
+    $.post('@path/@repository.owner/@repository.name/wiki/_preview', {
+      content: $('#content').val()
+    }, function(data){
+      $('#preview-area').html(data);
+    });
   });
 });
 </script>
\ No newline at end of file