diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index a04b5e75..062d185c 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -163,7 +163,7 @@ class FilterForm(FlaskForm):
 
         # Generic Filters
         if "All Devices" == self.device_type:
-            filter_type = None
+            filter_type = COMPUTERS + ["Monitor"] + MOBILE
 
         elif "All Components" == self.device_type:
             filter_type = COMPONENTS