diff --git a/app/views/comment/_comment_form.rhtml b/app/views/comment/_comment_form.rhtml
index a9413ca..7633bfb 100644
--- a/app/views/comment/_comment_form.rhtml
+++ b/app/views/comment/_comment_form.rhtml
@@ -3,9 +3,6 @@
 
 <% focus_on = logged_in? ? 'title' : 'name' %>
 
-<div class="post_comment_box <%= ((defined? show_form) && show_form) ? 'opened' : 'closed' %>">
-
-<%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link %>
 
 <% if !edition_mode && !pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
@@ -49,11 +46,17 @@ function check_captcha(button, confirm_action) {
 }
 </script>
 
-<% remote_form_for(:comment, comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
-
+<% if @comment && @comment.errors.any? %>
   <%= error_messages_for :comment %>
+  <script type="text/javascript">jQuery(function() { document.location.href = '#page-comment-form'; });</script>
+<% end %>
 
-  <%= hidden_field_tag(:confirm, 'false') %>
+<% @form_div ||= 'closed' %>
+
+<div class="post_comment_box <%= ((defined? show_form) && show_form) ? 'opened' : 'closed' %> <%= @form_div %>">
+
+  <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link && @comment.reply_of_id.blank? %>
+<% remote_form_for(:comment, comment, :url => {:profile => profile.identifier, :controller => 'comment', :action => (edition_mode ? 'update' : 'create'), :id => (edition_mode ?  comment.id : @page.id)}, :html => { :class => 'comment_form' } ) do |f| %>
 
   <%= required_fields_message %>
 
@@ -74,13 +77,18 @@ function check_captcha(button, confirm_action) {
 
   <%= labelled_form_field(_('Title'), f.text_field(:title)) %>
   <%= required labelled_form_field(_('Enter your comment'), f.text_area(:body, :rows => 5)) %>
+
+  <%= hidden_field_tag(:confirm, 'false') %>
+  <%= hidden_field_tag(:view, params[:view])%>
   <%= f.hidden_field(:reply_of_id) %>
 
   <% button_bar do %>
-      <%= submit_button('add', _('Post comment'), :onclick => "if(check_captcha(this)) { save_comment(this) } else { check_captcha(this, save_comment)};return false;") %>
-      <% if !edition_mode %>
-        <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
-      <% end %>
+    <%= submit_button('add', _('Post comment'), :onclick => "if(check_captcha(this)) { save_comment(this) } else { check_captcha(this, save_comment)};return false;") %>
+    <% if !edition_mode %>
+      <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
+    <% else %>
+      <%= button :cancel, _('Cancel'), '#', :onclick => "jQuery.colorbox.close();" %>
+    <% end %>
   <% end %>
 <% end %>
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 377b2a1..b6ac876 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -718,14 +718,15 @@ function add_comment_reply_form(button, comment_id) {
     f = comments_div.find('.comment_form').first().clone();
     f.find('.errorExplanation').remove();
     f.append('<input type="hidden" name="comment[reply_of_id]" value="' + comment_id + '" />');
-    container.append(f);
+    container.append('<div class="page-comment-form"></div>');
+    container.find('.page-comment-form').append(f);
   }
   if (container.hasClass('closed')) {
     container.removeClass('closed');
     container.addClass('opened');
     container.find('.comment_form input[type=text]:visible:first').focus();
   }
-  container.addClass('page-comment-form');
+  jQuery('.display-comment-form').hide();
   return f;
 }
 
diff --git a/public/javascripts/comment_form.js b/public/javascripts/comment_form.js
index c6357e5..7dcfefc 100644
--- a/public/javascripts/comment_form.js
+++ b/public/javascripts/comment_form.js
@@ -1,15 +1,21 @@
+jQuery('.display-comment-form').unbind();
 jQuery('.display-comment-form').click(function(){
-  toggleBox(jQuery(this).parents('.post_comment_box'));
+  var $button = jQuery(this);
+  toggleBox($button.parents('.post_comment_box'));
   jQuery('.display-comment-form').hide();
-  jQuery('form.comment_form input').first().focus();
+  $button.closest('.page-comment-form').find('input').first().focus();
   return false;
 });
 
+jQuery('#cancel-comment').die();
 jQuery('#cancel-comment').live("click", function(){
-  toggleBox(jQuery(this).parents('.post_comment_box'));
-  jQuery('.display-comment-form').show();
+  var $button = jQuery(this);
+  toggleBox($button.parents('.post_comment_box'));
+  show_display_comment_button();
+  var page_comment_form = $button.parents('.page-comment-form');
+  page_comment_form.find('.errorExplanation').remove();
   return false;
-})
+});
 
 function toggleBox(div){
   if(div.hasClass('opened')) {
@@ -25,9 +31,10 @@ function save_comment(button) {
   var $ = jQuery;
   open_loading(DEFAULT_LOADING_MESSAGE);
   var $button = $(button);
-  var form = $(button).parents("form");
-  var post_comment_box = $(button).parents('.post_comment_box');
+  var form = $button.parents("form");
+  var post_comment_box = $button.parents('.post_comment_box');
   var comment_div = $button.parents('.comments');
+  var page_comment_form = $button.parents('.page-comment-form');
   $button.addClass('comment-button-loading');
   $.post(form.attr("action"), form.serialize(), function(data) {
 
@@ -36,20 +43,19 @@ function save_comment(button) {
       form.find("input[type='text']").add('textarea').each(function() {
         this.value = '';
       });
-      form.find('.errorExplanation').remove();
-
+      page_comment_form.find('.errorExplanation').remove();
+      show_display_comment_button();
     } else if(data.render_target == 'form') {
       //Comment with errors
-      var page_comment_form = $(button).parents('.page-comment-form');
       $.scrollTo(page_comment_form);
       page_comment_form.html(data.html);
-
+      $('.display-comment-form').hide();
     } else if($('#' + data.render_target).size() > 0) {
       //Comment of reply
       $('#'+ data.render_target).replaceWith(data.html);
       $('#' + data.render_target).effect("highlight", {}, 3000);
       $.colorbox.close();
-
+      show_display_comment_button();
     } else {
       //New comment of article
       comment_div.find('.article-comments-list').append(data.html);
@@ -58,9 +64,9 @@ function save_comment(button) {
         this.value = '';
       });
 
-      form.find('.errorExplanation').remove();
+      page_comment_form.find('.errorExplanation').remove();
       $.colorbox.close();
-
+      show_display_comment_button();
     }
 
     comment_div.find('.comment-count').add('#article-header .comment-count').each(function() {
@@ -78,8 +84,12 @@ function save_comment(button) {
 
     close_loading();
     toggleBox($button.closest('.post_comment_box'));
-    $('.display-comment-form').show();
     $button.removeClass('comment-button-loading');
     $button.enable();
   }, 'json');
 }
+
+function show_display_comment_button() {
+  if(jQuery('.post_comment_box.opened').length==0)
+    jQuery('.display-comment-form').show();
+}
--
libgit2 0.21.2