diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index 31844495..c046a09e 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -86,18 +86,18 @@
   </div>
 </div>
 
-<%= form_tag(entries_operations_dmsf_path(:id => @project, :folder_id => @folder), :method => :post,
-              :class => 'dmsf_entries', :id => 'entries_form', :data => {:cm_url => dmsf_context_menu_path}) do %>
+<%= form_tag(entries_operations_dmsf_path(id: @project, folder_id: @folder), method: :post,
+              class: 'dmsf_entries', id: 'entries_form', data: { cm_url: dmsf_context_menu_path }) do %>
   <%= hidden_field_tag('action') %>
   <% unless @system_folder %>
-    <div id="dmsf_buttons" class="dmsf_controls" style="float: left">
-      <%= submit_tag(l(:button_download), :title => l(:title_download_checked), :name => 'download_entries',
-                     :class => 'toggle-selection') if @file_view_allowed %>
-      <%= submit_tag(l(:field_mail), :title => l(:title_send_checked_by_email), :name => 'email_entries',
-                     :class => 'toggle-selection') if (@file_view_allowed && User.current.allowed_to?(:email_documents, @project)) %>
+    <div id="dmsf_buttons" class="dmsf_controls">
+      <%= submit_tag(l(:button_download), title: l(:title_download_checked), name: 'download_entries',
+        class: 'toggle-selection', data: { disable_with: false }) if @file_view_allowed %>
+      <%= submit_tag(l(:field_mail), title: l(:title_send_checked_by_email), name: 'email_entries', class: 'toggle-selection',
+        data: { disable_with: false }) if (@file_view_allowed && User.current.allowed_to?(:email_documents, @project)) %>
       <% if @file_delete_allowed %>
-        <%= submit_tag(l(:button_delete), :title => l(:title_delete_checked), :name => 'delete_entries',
-                       :class => 'toggle-selection', :data => { :confirm => l(:text_are_you_sure) }) if @file_delete_allowed %>
+        <%= submit_tag(l(:button_delete), title: l(:title_delete_checked), name: 'delete_entries', class: 'toggle-selection',
+          data: { confirm: l(:text_are_you_sure), disable_with: false }) if @file_delete_allowed %>
       <% end %>
     </div>
   <% end %>
@@ -107,7 +107,7 @@
       <% values.sort! { |a, b| a.custom_field.position <=> b.custom_field.position } %>
       <% custom_value = values.first %>
       <% if custom_value.custom_field.format.is_a?(Redmine::FieldFormat::ListFormat) %>
-        <div id="dmsf_tag" class="dmsf_controls" style="float: right">
+        <div id="dmsf_tag" class="dmsf_controls">
           <% custom_value.custom_field.is_required = false %>
           <% custom_value.value = params[:custom_value].present? ? params[:custom_value] : '' %>
           <%= h(custom_value.custom_field.name) %>:
diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb
index 884be48b..611d98a6 100644
--- a/app/views/dmsf/trash.html.erb
+++ b/app/views/dmsf/trash.html.erb
@@ -33,7 +33,7 @@
 <%= form_tag(entries_operations_dmsf_path(:id => @project, :folder_id => @folder), :method => :post,
   :class => 'dmsf_entries', :id => 'entries_form', :data => {:cm_url => dmsf_trash_context_menu_path}) do %>
   <%= hidden_field_tag('action') %>
-  <div id="dmsf_buttons"  class="dmsf_controls" style="float: left">
+  <div id="dmsf_buttons"  class="dmsf_controls">
     <% if @file_manipulation_allowed && @folder_manipulation_allowed %>
       <%= submit_tag l(:title_restore), :title => l(:title_restore_checked), :name => 'restore_entries',
         :class => 'toggle-selection' %>
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index e3720316..8d5c24e9 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -80,7 +80,7 @@
   <div class="dmsf_revision_box tabular dataTables_wrapper">
     <div class="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix">
       <div class="dataTables_lenght">
-        <div class="dmsf_controls" style="float: right">
+        <div id="dmsf_tag" class="dmsf_controls">
           <%= link_to_function image_tag('group.png'),
             "$('#revision_access-#{revision.id}').toggle()",
             :title => l(:title_download_entries) %>
diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css
index bb89a413..07dcdc87 100644
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@@ -125,6 +125,14 @@ div.dataTables_length label {
 	font-size: 0.9em;
 }
 
+#dmsf_buttons.dmsf_controls {
+    float: left
+}
+
+#dmsf_tag.dmsf_controls {
+    float: right
+}
+
 #browser_filter.dataTables_filter {
     float:none;
 }