diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index d4cad6d05..25d022029 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -5,6 +5,11 @@
               :title => l(:label_edit_attachments),
               :class => 'icon-only icon-edit'
              ) if options[:editable] %>
+  <%= link_to(l(:label_download_all_attachments),
+              container_attachments_download_path(container),
+              :title => l(:label_download_all_attachments),
+              :class => 'icon-only icon-download'
+             ) if attachments.size > 1 %>
 </div>
 <table>
 <% for attachment in attachments %>
@@ -42,13 +47,4 @@
   </div>
   <% end %>
 <% end %>
-<% if attachments.size > 1 %>
-<div class="bulk-download">
-  <%= link_to(l(:label_download_all_attachments),
-  container_attachments_download_path(container),
-  :title => l(:label_download_all_attachments),
-  :class => 'icon icon-download'
-  ) %>
-</div>
-<% end %>
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1cfb7a3b3..131da3213 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -902,8 +902,6 @@ div.attachments p { margin:4px 0 2px 0; }
 div.attachments img { vertical-align: middle; }
 div.attachments span.author { font-size: 0.9em; color: #888; }
 
-div.bulk-download { margin-top: 1em; margin-left: 0.3em; margin-bottom: 0.4em;}
-
 div.thumbnails {margin:0.6em;}
 div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;}
 div.thumbnails img {margin: 3px; vertical-align: middle;}
diff --git a/test/integration/routing/attachments_test.rb b/test/integration/routing/attachments_test.rb
index 14a5c784a..1a323d6fb 100644
--- a/test/integration/routing/attachments_test.rb
+++ b/test/integration/routing/attachments_test.rb
@@ -35,5 +35,6 @@ class RoutingAttachmentsTest < Redmine::RoutingTest
 
     should_route 'GET /attachments/issues/1/edit' => 'attachments#edit_all', :object_type => 'issues', :object_id => '1'
     should_route 'PATCH /attachments/issues/1' => 'attachments#update_all', :object_type => 'issues', :object_id => '1'
+    should_route 'GET /attachments/issues/1/download' => 'attachments#download_all', :object_type => 'issues', :object_id => '1'
   end
 end