diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index 50010313..ef02266a 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -53,7 +53,7 @@ class DmsfFilesController < ApplicationController
         @revision = DmsfFileRevision.find(params[:download].to_i)
         raise DmsfAccessError if @revision.dmsf_file != @file
       end
-      check_project(@revision.dmsf_file)
+      check_project @revision.dmsf_file
       raise ActionController::MissingFile if @file.deleted?
       access = DmsfFileRevisionAccess.new
       access.user = User.current
@@ -68,10 +68,10 @@ class DmsfFilesController < ApplicationController
       end
       # IE has got a tendency to cache files
       expires_in(0.year, 'must-revalidate' => true)
-      send_file(@revision.disk_file,
+      send_file @revision.disk_file,
         filename: filename_for_content_disposition(@revision.formatted_name(title_format)),
         type: @revision.detect_content_type,
-        disposition: @revision.dmsf_file.disposition)
+        disposition: params[:disposition].present? ? params[:disposition] : @revision.dmsf_file.disposition
     rescue DmsfAccessError => e
       Rails.logger.error e.message
       render_403
diff --git a/app/views/dmsf_context_menus/_file.html.erb b/app/views/dmsf_context_menus/_file.html.erb
index a02025b8..7047f2e8 100644
--- a/app/views/dmsf_context_menus/_file.html.erb
+++ b/app/views/dmsf_context_menus/_file.html.erb
@@ -51,8 +51,8 @@
     <%= render(partial: 'approval_workflow', locals: { dmsf_file: dmsf_file, project: project, locked: locked }) %>
 </li>
 <li>
-<%= context_menu_link l(:button_download), view_dmsf_file_path(dmsf_file), class: 'icon icon-download',
-                      disabled: false %>
+<%= context_menu_link l(:button_download), view_dmsf_file_path(dmsf_file, disposition: 'attachment'),
+                      class: 'icon icon-download', disabled: false %>
 </li>
 <li>
 <%= context_menu_link l(:field_mail), entries_operations_dmsf_path(id: @project, folder_id: folder,
diff --git a/app/views/dmsf_context_menus/_revision_actions.html.erb b/app/views/dmsf_context_menus/_revision_actions.html.erb
index 5196a7c4..5f37a850 100644
--- a/app/views/dmsf_context_menus/_revision_actions.html.erb
+++ b/app/views/dmsf_context_menus/_revision_actions.html.erb
@@ -24,7 +24,7 @@
                      "$('#revision_access_#{revision.id}').toggle(); $('.drdn.expanded').removeClass('expanded');",
                      class: 'icon icon-group dmsf-revision-action-button' %>
 <%= link_to l(:title_download),
-            view_dmsf_file_path(file, download: revision),
+            view_dmsf_file_path(file, download: revision, disposition: 'attachment'),
             title: l(:title_title_version_version_download, title: h(revision.title), version: revision.version),
             class: 'icon icon-download dmsf-revision-action-button' %>
 <%= link_to l(:title_obsolete_revision),