diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 0a9f5e3eb..3e5904ae8 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -8,7 +8,7 @@
 </div>
 <table>
 <% for attachment in attachments %>
-<tr>
+<tr id="attachment_<%= attachment.id %>">
   <td>
     <%= link_to_attachment attachment, class: 'icon icon-attachment' -%>
     <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
@@ -23,7 +23,7 @@
   <td>
     <% if options[:deletable] %>
       <%= link_to l(:button_delete), attachment_path(attachment),
-                  :data => {:confirm => l(:text_are_you_sure)},
+                  :data => {:confirm => l(:text_are_you_sure), :remote => true},
                   :method => :delete,
                   :class => 'delete icon-only icon-del',
                   :title => l(:button_delete) %>
@@ -37,7 +37,7 @@
   <% if images.any? %>
   <div class="thumbnails">
     <% images.each do |attachment| %>
-      <div><%= thumbnail_tag(attachment) %></div>
+      <div id="thumbnail_<%= attachment.id %>"><%= thumbnail_tag(attachment) %></div>
     <% end %>
   </div>
   <% end %>
diff --git a/app/views/attachments/destroy.js.erb b/app/views/attachments/destroy.js.erb
index 29b9a0c76..0963ba0ee 100644
--- a/app/views/attachments/destroy.js.erb
+++ b/app/views/attachments/destroy.js.erb
@@ -1,2 +1,3 @@
 $('#attachments_<%= j params[:attachment_id] %>').closest('.attachments_form').find('.add_attachment').show();
-$('#attachments_<%= j params[:attachment_id] %>').remove();
+$('#attachments_<%= j params[:attachment_id] %>, tr#attachment_<%= j params[:id] %>, div#thumbnail_<%= j params[:id] %>').remove();
+$('#attachments_count').html('<%= @attachment.container.try(:attachments).try(:length) %>');
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 8dd106818..970d2fd73 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -46,7 +46,7 @@
 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
 
 <fieldset class="collapsible collapsed">
-  <legend onclick="toggleFieldset(this);"><%= l(:label_attachment_plural) %> (<%= @page.attachments.length %>)</legend>
+  <legend onclick="toggleFieldset(this);"><%= l(:label_attachment_plural) %> (<span id="attachments_count"><%= @page.attachments.length %></span>)</legend>
   <div style="display: none;">
 
   <%= link_to_attachments @page, :thumbnails => true %>
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 016ed28fa..de8d26673 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -607,4 +607,19 @@ class AttachmentsControllerTest < Redmine::ControllerTest
     assert_response 302
     assert Attachment.find_by_id(3)
   end
+
+  def test_destroy_xhr
+    set_tmp_attachments_directory
+    @request.session[:user_id] = 2
+    @attachment_count = Attachment.find(9).container.try(:attachments).try(:length)
+    assert_difference 'Attachment.count', -1 do
+      delete :destroy, :params => {
+          :id => 9
+        },
+        :xhr => true
+      assert_response :success
+      assert_equal 'text/javascript', response.content_type
+      assert_include (@attachment_count - 1).to_s, response.body
+    end
+  end
 end