diff --git a/netbox/netbox/forms.py b/netbox/netbox/forms.py
index caa074e18..c682c353e 100644
--- a/netbox/netbox/forms.py
+++ b/netbox/netbox/forms.py
@@ -15,6 +15,7 @@ OBJ_TYPE_CHOICES = (
         ('rack', 'Racks'),
         ('devicetype', 'Device types'),
         ('device', 'Devices'),
+        ('virtualchassis','Virtual Chassis'),
     )),
     ('IPAM', (
         ('vrf', 'VRFs'),
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 0f240fff3..e3fd4d4db 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -12,9 +12,9 @@ from rest_framework.views import APIView
 from circuits.filters import CircuitFilter, ProviderFilter
 from circuits.models import Circuit, Provider
 from circuits.tables import CircuitTable, ProviderTable
-from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter
-from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site
-from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable
+from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter, VirtualChassisFilter
+from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site, VirtualChassis
+from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable, VirtualChassisTable
 from extras.models import ReportResult, TopologyMap, UserAction
 from ipam.filters import AggregateFilter, IPAddressFilter, PrefixFilter, VLANFilter, VRFFilter
 from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF
@@ -72,6 +72,12 @@ SEARCH_TYPES = OrderedDict((
         'table': DeviceDetailTable,
         'url': 'dcim:device_list',
     }),
+    ('virtualchassis', {
+        'queryset': VirtualChassis.objects.select_related('master'),
+        'filter': VirtualChassisFilter,
+        'table': VirtualChassisTable,
+        'url': 'dcim:virtualchassis_list',
+    }),
     # IPAM
     ('vrf', {
         'queryset': VRF.objects.select_related('tenant'),