diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 4c68e0a2..b7a8ff36 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -32,9 +32,9 @@ class DmsfFolder < ActiveRecord::Base
   belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id'
   belongs_to :user
 
-  has_many :dmsf_folders, :dependent => :destroy
+  has_many :dmsf_folders, -> { order(:title) }, :dependent => :destroy
   has_many :dmsf_files, :dependent => :destroy
-  has_many :folder_links, -> { where :target_type => 'DmsfFolder' },
+  has_many :folder_links, -> { where(:target_type => 'DmsfFolder').order(:name) },
     :class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy
   has_many :file_links, -> { where :target_type => 'DmsfFile' },
     :class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy
diff --git a/lib/redmine_dmsf/patches/project_patch.rb b/lib/redmine_dmsf/patches/project_patch.rb
index cae7be20..b0e35423 100644
--- a/lib/redmine_dmsf/patches/project_patch.rb
+++ b/lib/redmine_dmsf/patches/project_patch.rb
@@ -32,9 +32,9 @@ module RedmineDmsf
           unloadable
           alias_method_chain :copy, :dmsf
 
-          has_many :dmsf_files, -> { where dmsf_folder_id: nil},
+          has_many :dmsf_files, -> { where(dmsf_folder_id: nil).order(:name) },
             :class_name => 'DmsfFile', :foreign_key => 'project_id', :dependent => :destroy
-          has_many :dmsf_folders, -> {where dmsf_folder_id: nil},
+          has_many :dmsf_folders, -> { where(dmsf_folder_id: nil).order(:title) },
             :class_name => 'DmsfFolder', :foreign_key => 'project_id',
             :dependent => :destroy
           has_many :dmsf_workflows, :dependent => :destroy