diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 4d4f80d5..0dfe61fb 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -147,7 +147,7 @@ class DmsfController < ApplicationController
       selected_dir_links.blank? && selected_file_links.blank? &&
       selected_url_links.blank?
       flash[:warning] = l(:warning_no_entries_selected)
-      redirect_to :back
+      redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
       return
     end
 
@@ -166,13 +166,13 @@ class DmsfController < ApplicationController
         email_entries(selected_folders, selected_files)
       elsif params[:restore_entries].present?
         restore_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links)
-        redirect_to :back
+        redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
       elsif params[:delete_entries].present?
         delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, false)
-        redirect_to :back
+        redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
       elsif params[:destroy_entries].present?
         delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, true)
-        redirect_to :back
+        redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
       else
         download_entries(selected_folders, selected_files)
       end
@@ -194,7 +194,7 @@ class DmsfController < ApplicationController
         return redirect_to dmsf_folder_path id: @project, folder_id: @folder, custom_field_id: key, custom_value: value
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def entries_email
@@ -289,7 +289,7 @@ class DmsfController < ApplicationController
     respond_to do |format|
       format.html do
         if commit
-          redirect_to :back
+          redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
         else
           redirect_to dmsf_folder_path(id: @project, folder_id: @parent)
         end
@@ -334,7 +334,7 @@ class DmsfController < ApplicationController
       end
       flash[:notice] = l(:notice_folder_notifications_activated)
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def notify_deactivate
@@ -349,7 +349,7 @@ class DmsfController < ApplicationController
       end
       flash[:notice] = l(:notice_folder_notifications_deactivated)
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def lock
@@ -361,7 +361,7 @@ class DmsfController < ApplicationController
       @folder.lock!
       flash[:notice] = l(:notice_folder_locked)
     end
-      redirect_to :back
+      redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def unlock
@@ -377,7 +377,7 @@ class DmsfController < ApplicationController
         flash[:error] = l(:error_only_user_that_locked_folder_can_unlock_it)
       end
     end
-     redirect_to :back
+     redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def add_email
diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index f85b23fe..57e45429 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -158,7 +158,7 @@ class DmsfFilesController < ApplicationController
               Rails.logger.error e.message
               flash[:error] = e.message
               revision.destroy
-              redirect_to :back
+              redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
               return
             end
           end
@@ -194,7 +194,7 @@ class DmsfFilesController < ApplicationController
         end
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def delete
@@ -268,7 +268,7 @@ class DmsfFilesController < ApplicationController
         flash[:error] = e.message
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def unlock
@@ -286,7 +286,7 @@ class DmsfFilesController < ApplicationController
         flash[:error] = l(:error_only_user_that_locked_file_can_unlock_it)
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def notify_activate
@@ -296,7 +296,7 @@ class DmsfFilesController < ApplicationController
       @file.notify_activate
       flash[:notice] = l(:notice_file_notifications_activated)
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def notify_deactivate
@@ -306,7 +306,7 @@ class DmsfFilesController < ApplicationController
       @file.notify_deactivate
       flash[:notice] = l(:notice_file_notifications_deactivated)
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def restore
@@ -315,7 +315,7 @@ class DmsfFilesController < ApplicationController
     else
       flash[:error] = @file.errors.full_messages.to_sentence
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def thumbnail
diff --git a/app/controllers/dmsf_folders_copy_controller.rb b/app/controllers/dmsf_folders_copy_controller.rb
index 33408173..797854ef 100644
--- a/app/controllers/dmsf_folders_copy_controller.rb
+++ b/app/controllers/dmsf_folders_copy_controller.rb
@@ -43,7 +43,7 @@ class DmsfFoldersCopyController < ApplicationController
       redirect_to dmsf_folder_path(id: @target_project, folder_id: new_folder)
     else
       flash[:error] = new_folder.errors.full_messages.to_sentence
-      redirect_to :back
+      redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
     end
   end
 
@@ -53,7 +53,7 @@ class DmsfFoldersCopyController < ApplicationController
       redirect_to dmsf_folder_path(id: @target_project, folder_id: @folder)
     else
       flash[:error] = @folder.errors.full_messages.to_sentence
-      redirect_to :back
+      redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
     end
   end
 
diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb
index bfc0a182..a8fb0fef 100644
--- a/app/controllers/dmsf_links_controller.rb
+++ b/app/controllers/dmsf_links_controller.rb
@@ -187,7 +187,7 @@ class DmsfLinksController < ApplicationController
     if @dmsf_link.restore
       flash[:notice] = l(:notice_dmsf_link_restored)
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   private
diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb
index 18588dd0..66057b09 100644
--- a/app/controllers/dmsf_workflows_controller.rb
+++ b/app/controllers/dmsf_workflows_controller.rb
@@ -180,7 +180,7 @@ class DmsfWorkflowsController < ApplicationController
         end
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def assign
@@ -215,7 +215,7 @@ class DmsfWorkflowsController < ApplicationController
         rescue => e
           flash[:error] = e.message
         end
-        redirect_to :back
+        redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
         return
       # DMS link (attached)
       elsif params[:dmsf_link_id].present?
@@ -227,7 +227,7 @@ class DmsfWorkflowsController < ApplicationController
         @dmsf_workflow_id = params[:dmsf_workflow_id]
       end
      else
-      redirect_to :back
+      redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
       return
     end
     respond_to do |format|
@@ -394,7 +394,7 @@ class DmsfWorkflowsController < ApplicationController
         end
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def reorder_steps
@@ -422,7 +422,7 @@ class DmsfWorkflowsController < ApplicationController
         flash[:error] = l(:notice_cannot_start_workflow)
       end
     end
-    redirect_to :back
+    redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
   end
 
   def update_step
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index d896e9cb..0d1d5e8a 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -24,7 +24,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class ProjectsControllerTest < RedmineDmsf::Test::TestCase
 
   include Redmine::I18n
-  
+
   def test_settings_dms_member
     @request.session[:user_id] = @jsmith.id
     @role_manager.add_permission! :user_preferences
diff --git a/test/integration/webdav/dmsf_webdav_delete_test.rb b/test/integration/webdav/dmsf_webdav_delete_test.rb
index b8434d26..b2697a12 100644
--- a/test/integration/webdav/dmsf_webdav_delete_test.rb
+++ b/test/integration/webdav/dmsf_webdav_delete_test.rb
@@ -70,7 +70,6 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
 
   def test_delete_when_ro
     with_settings plugin_redmine_dmsf: {'dmsf_webdav_strategy' => 'WEBDAV_READ_ONLY', 'dmsf_webdav' => '1'} do
-      puts Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
       delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", params: nil, headers: @admin
       assert_response :bad_gateway # WebDAV is read only
     end