diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 10a82a15c..95ddc1c91 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -601,7 +601,7 @@ def device(request, pk):
     secrets = device.secrets.all()
 
     # Find all IP addresses assigned to this device
-    ip_addresses = IPAddress.objects.filter(interface__device=device).select_related('interface').order_by('interface')
+    ip_addresses = IPAddress.objects.filter(interface__device=device).select_related('interface').order_by('address')
 
     # Find any related devices for convenient linking in the UI
     related_devices = []
diff --git a/netbox/templates/dcim/inc/_ipaddress.html b/netbox/templates/dcim/inc/_ipaddress.html
index 8d159d1f2..4b73f6721 100644
--- a/netbox/templates/dcim/inc/_ipaddress.html
+++ b/netbox/templates/dcim/inc/_ipaddress.html
@@ -1,8 +1,8 @@
 <tr>
-    <td>{{ ip.interface }}</td>
     <td>
         <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a>
     </td>
+    <td>{{ ip.interface }}</td>
     <td>
         {% if device.primary_ip == ip %}
             <span class="label label-success">Primary</span>