diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py
index 07e2c4477..3cda30ccc 100644
--- a/netbox/circuits/tables.py
+++ b/netbox/circuits/tables.py
@@ -79,7 +79,13 @@ class CircuitSearchTable(SearchTable):
     cid = tables.LinkColumn(verbose_name='ID')
     provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')])
     tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    a_side = tables.LinkColumn(
+        'dcim:site', accessor=Accessor('termination_a.site'), args=[Accessor('termination_a.site.slug')]
+    )
+    z_side = tables.LinkColumn(
+        'dcim:site', accessor=Accessor('termination_z.site'), args=[Accessor('termination_z.site.slug')]
+    )
 
     class Meta(SearchTable.Meta):
         model = Circuit
-        fields = ('cid', 'type', 'provider', 'tenant', 'description')
+        fields = ('cid', 'type', 'provider', 'tenant', 'a_side', 'z_side', 'description')
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 8e42086bc..79ffa651e 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -36,7 +36,7 @@ SEARCH_TYPES = {
         'url': 'circuits:provider_list',
     },
     'circuit': {
-        'queryset': Circuit.objects.select_related('type', 'provider', 'tenant'),
+        'queryset': Circuit.objects.select_related('type', 'provider', 'tenant').prefetch_related('terminations__site'),
         'filter': CircuitFilter,
         'table': CircuitSearchTable,
         'url': 'circuits:circuit_list',