diff --git a/app/views/exercises/_editor.html.slim b/app/views/exercises/_editor.html.slim
index 42b12e42..3340d6ac 100644
--- a/app/views/exercises/_editor.html.slim
+++ b/app/views/exercises/_editor.html.slim
@@ -1,7 +1,7 @@
 #editor.row data-exercise-id=exercise.id data-message-depleted=t('exercises.editor.depleted') data-message-timeout=t('exercises.editor.timeout', permitted_execution_time: @exercise.execution_environment.permitted_execution_time) data-errors-url=execution_environment_errors_path(exercise.execution_environment) data-submissions-url=submissions_path data-user-id=@current_user.id
   div class=(@exercise.hide_file_tree ? 'hidden col-sm-3' : 'col-sm-3') = render('editor_file_tree', files: @files)
   div id='frames' class=(@exercise.hide_file_tree ? 'col-sm-12' : 'col-sm-9')
-    - @files.each do |file|
+    - @files.sort{ |a,b| a[:group][:name] <=> b[:group][:name] }.each do |file|
       = render('editor_frame', exercise: exercise, file: file)
     #autosave-label
       = t('exercises.editor.lastsaved')
@@ -38,4 +38,4 @@
               = t('exercises.editor.test')
       = render('editor_button', data: {:'data-placement' => 'top', :'data-tooltip' => true}, icon: 'fa fa-trophy', id: 'assess', label: t('exercises.editor.score'), title: t('shared.tooltips.shortcut', shortcut: 'ALT + s'))
 
-= render('shared/modal', id: 'comment-modal', title: t('exercises.implement.comment.request'), template: 'exercises/_request_comment_dialogcontent')
\ No newline at end of file
+= render('shared/modal', id: 'comment-modal', title: t('exercises.implement.comment.request'), template: 'exercises/_request_comment_dialogcontent')
diff --git a/app/views/exercises/show.html.slim b/app/views/exercises/show.html.slim
index ceab96a7..85fb09cb 100644
--- a/app/views/exercises/show.html.slim
+++ b/app/views/exercises/show.html.slim
@@ -23,7 +23,7 @@ h1
 h2 = t('activerecord.attributes.exercise.files')
 
 ul.list-unstyled.panel-group#files
-  - @exercise.files.each do |file|
+  - @exercise.files.order('name').each do |file|
     li.panel.panel-default
       .panel-heading role="tab" id="heading"
         div.clearfix role="button"