diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 9ecaaa76a..cb7176787 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -516,7 +516,7 @@ class RearPortViewSet(PassThroughPortMixin, NetBoxModelViewSet):
 
 
 class ModuleBayViewSet(NetBoxModelViewSet):
-    queryset = ModuleBay.objects.all()
+    queryset = ModuleBay.objects.order_by('device', 'module', 'name')
     serializer_class = serializers.ModuleBaySerializer
     filterset_class = filtersets.ModuleBayFilterSet
 
diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py
index 9bdb64919..bbe2aad7b 100644
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -746,7 +746,7 @@ class ModuleForm(ModuleCommonForm, PrimaryModelForm):
         queryset=ModuleBay.objects.all(),
         query_params={
             'device_id': '$device',
-            'ordering': 'name',
+            'ordering': 'module,name',
         },
         context={
             'disabled': 'installed_module',