diff --git a/progit/templates/issue.html b/progit/templates/issue.html
index 3ccf9bd..acc2373 100644
--- a/progit/templates/issue.html
+++ b/progit/templates/issue.html
@@ -55,24 +55,66 @@
 
 <section class="issue_comment add_comment">
 {% if authenticated %}
-  <form action="{{ url_for('add_comment_issue', username=username,
-                   repo=repo.name, issueid=issueid) }}" method="post">
-    <header>
-      <label for="comment">Add new comment</label>
-      (supports the <a href="http://daringfireball.net/projects/markdown/syntax"
-        target="_blank">Markdown syntax</a>)
-    </header>
-    <div>
-      <textarea id="comment" name="comment" placeholder="Enter your comment here"></textarea>
-      {{ form_comment.csrf_token }}
+  <header>
+    <label for="comment">Add new comment</label>
+    (supports the <a href="http://daringfireball.net/projects/markdown/syntax"
+      target="_blank">Markdown syntax</a>)
+  </header>
+  <div id="tabs">
+    <ul>
+      <li><a href="#edit">Comment</a></li>
+      <li><a href="#preview">Preview</a></li>
+    </ul>
+    <div id="edit">
+      <form action="{{ url_for('add_comment_issue', username=username,
+                       repo=repo.name, issueid=issueid) }}" method="post">
+
+        <div>
+          <textarea id="comment" name="comment" placeholder="Enter your comment here"></textarea>
+          {{ form_comment.csrf_token }}
+        </div>
+        <div>
+          <input type="submit" class="submit positive button" value="Comment">
+        </div>
+      </form>
     </div>
-    <div>
-      <input type="submit" class="submit positive button" value="Comment">
+    <div id="preview">
     </div>
-  </form>
+  </div>
 {% else %}
   <p><a href="{{ url_for('auth_login') }}">Login</a> to comment on this ticket.</p>
 {% endif %}
 </section>
 
 {% endblock %}
+
+{% block jscripts %}
+{{ super() }}
+<script type="text/javascript">
+$(function() {
+  $( "#tabs" ).tabs();
+
+  $( "#tabs" ).on('tabsactivate',
+    function(event, ui) {
+      if (ui.newPanel.selector == '#preview') {
+        var _text = $( "#comment" ).val();
+        var _url = "{{ url_for('markdown_preview') }}";
+          $.ajax({
+              url: _url ,
+              type: 'POST',
+              data: {content: _text},
+              dataType: 'html',
+              success: function(res) {
+                  $( "#preview" ).html(res);
+              },
+              error: function() {
+                  alert('Unable to generate preview!');
+              }
+          });
+          return false;
+      }
+    }
+  );
+});
+</script>
+{% endblock %}