diff --git a/pagure/templates/comment_update.html b/pagure/templates/comment_update.html
index ecd590f..7e943dc 100644
--- a/pagure/templates/comment_update.html
+++ b/pagure/templates/comment_update.html
@@ -12,19 +12,23 @@
         id="comment_block">
 
       <div id="edit">
-        <textarea id="update_comment" name="update_comment">{{ comment.comment }}</textarea>
+        <textarea id="update_comment" name="update_comment" style="width:100%;">
+          {{- comment.comment -}}
+        </textarea>
       </div>
 
     <div>
 
   {{ form.csrf_token }}
     <div>
-      <input type="hidden" name="edit_comment" value="{{ comment.id }}"/>
+      <input type="hidden" name="edit_comment" value="{{ comment.id }}" />
       <input type="submit" class="submit positive button" value="Update" />
-      <input type="button" class="cancel" value="Cancel" onclick="history.back();"/>
+      <input type="button" class="cancel" value="Cancel" {% if not is_js -%}
+        onclick="history.back();"{% endif %} />
     </div>
   {% if not is_js %}
   </form>
   {% endif %}
 </section>
+
 {% endblock %}
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index ddef187..3238906 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -336,14 +336,26 @@ $(function() {
         success: function(res) {
             var el = $('#comment-' + commentid);
             var sec = el.parent().children()[1];
-            $(sec).html(res);
+            $(sec).hide();
+            $(sec).after(res);
+            cancel_edit_btn();
         },
         error: function() {
             alert('Could not make edit work');
         }
     });
     return false;
-  })
+  });
+
+  function cancel_edit_btn() {
+    $( ".cancel" ).click(
+      function() {
+        $(this).parent().parent().parent().parent().parent().find('.comment_body').show();
+        $(this).parent().parent().parent().parent().remove();
+        return false;
+      }
+    );
+  };
 
 });
 </script>