diff --git a/netbox/dcim/migrations/0005_auto_20160328_2135.py b/netbox/dcim/migrations/0005_auto_20160328_2135.py
new file mode 100644
index 000000000..eaf465bd4
--- /dev/null
+++ b/netbox/dcim/migrations/0005_auto_20160328_2135.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-03-28 21:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0004_auto_20160328_2109'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='module',
+            options={'ordering': ['device__id', 'parent__id', 'name']},
+        ),
+    ]
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index eb80a9b58..624d1b753 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -682,7 +682,7 @@ class Module(models.Model):
     serial = models.CharField(max_length=50, verbose_name='Serial number', blank=True)
 
     class Meta:
-        ordering = ['device', 'parent', 'name']
+        ordering = ['device__id', 'parent__id', 'name']
         unique_together = ['device', 'parent', 'name']
 
     def __unicode__(self):