diff --git a/app/models/code_ocean/file.rb b/app/models/code_ocean/file.rb
index 22c6e877..9ae40b19 100644
--- a/app/models/code_ocean/file.rb
+++ b/app/models/code_ocean/file.rb
@@ -47,6 +47,8 @@ module CodeOcean
       scope :"#{role}s", -> { where(role: role) }
     end
 
+    default_scope { order(name: :asc) }
+
     validates :feedback_message, if: :teacher_defined_test?, presence: true
     validates :feedback_message, absence: true, unless: :teacher_defined_test?
     validates :file_type_id, presence: true
diff --git a/app/views/exercises/show.html.slim b/app/views/exercises/show.html.slim
index e3dfc7d5..c2e8dd5b 100644
--- a/app/views/exercises/show.html.slim
+++ b/app/views/exercises/show.html.slim
@@ -25,7 +25,7 @@ h1
 h2 = t('activerecord.attributes.exercise.files')
 
 ul.list-unstyled.panel-group#files
-  - @exercise.files.order('name').each do |file|
+  - @exercise.files.each do |file|
     li.panel.panel-default
       .panel-heading role="tab" id="heading"
         a.file-heading data-toggle="collapse" data-parent="#files" href=".collapse#{file.id}"