diff --git a/core/migrations/0015_auto_20170713_1220.py b/core/migrations/0015_auto_20170713_1220.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb7230989fa12669bcd06131e0a720a5a9ba6666
--- /dev/null
+++ b/core/migrations/0015_auto_20170713_1220.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-07-13 12:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0014_auto_20170712_1704'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='submission',
+            options={'ordering': ('type__name',), 'verbose_name': 'Submission', 'verbose_name_plural': 'Submission Set'},
+        ),
+    ]
diff --git a/core/models.py b/core/models.py
index 31880da0ddbec12922118cfc5246d57e17989253..802b5fe3a53f4662a23966a9c5edb22acadd1f78 100644
--- a/core/models.py
+++ b/core/models.py
@@ -225,6 +225,7 @@ class Submission(models.Model):
         verbose_name        = "Submission"
         verbose_name_plural = "Submission Set"
         unique_together     = (('type', 'student'),)
+        ordering            = ('type__name',)
 
     def __str__(self):
         return "Submission of type '{}' from Student '{}'".format(