diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 27982d34..f42b6499 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -237,7 +237,10 @@ class DmsfFile < ActiveRecord::Base
     if User.current.admin?
       projects = Project.visible.has_module('dmsf').all
     elsif User.current.logged?
-      User.current.memberships.each {|m| projects << m.project if m.roles.detect {|r| r.allowed_to?(:file_manipulation)} && m.project.module_enabled?('dmsf')}
+      User.current.memberships.each do |m|
+        projects << m.project if m.project.module_enabled?('dmsf') &&
+          m.roles.detect { |r| r.allowed_to?(:file_manipulation) }
+      end
     end
     projects
   end
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index e6cfcaad..b1284836 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -217,9 +217,12 @@ class DmsfFolder < ActiveRecord::Base
   def self.allowed_target_projects_on_copy
     projects = []
     if User.current.admin?
-      projects = Project.visible.all
+      projects = Project.visible.has_module('dmsf').all
     elsif User.current.logged?
-      User.current.memberships.each {|m| projects << m.project if m.roles.detect {|r| r.allowed_to?(:folder_manipulation) && r.allowed_to?(:file_manipulation)}}
+      User.current.memberships.each do |m|
+        projects << m.project if m.project.module_enabled?('dmsf') &&
+          m.roles.detect { |r| r.allowed_to?(:folder_manipulation) && r.allowed_to?(:file_manipulation) }
+      end
     end
     projects
   end