diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md
index b781a09fe..616329bea 100644
--- a/docs/release-notes/version-3.2.md
+++ b/docs/release-notes/version-3.2.md
@@ -17,6 +17,7 @@
 * [#9151](https://github.com/netbox-community/netbox/issues/9151) - Child prefix counts not annotated on aggregates list under RIR view
 * [#9156](https://github.com/netbox-community/netbox/issues/9156) - Fix loading UserConfig data from fixtures
 * [#9158](https://github.com/netbox-community/netbox/issues/9158) - Do not list tags field for CSV forms which do not support tag assignment
+* [#9206](https://github.com/netbox-community/netbox/issues/9206) - Show header for comments field under module & module type creation views
 
 ---
 
diff --git a/netbox/dcim/forms/models.py b/netbox/dcim/forms/models.py
index fe9daf938..31c5b957d 100644
--- a/netbox/dcim/forms/models.py
+++ b/netbox/dcim/forms/models.py
@@ -385,6 +385,12 @@ class ModuleTypeForm(NetBoxModelForm):
     )
     comments = CommentField()
 
+    fieldsets = (
+        ('Module Type', (
+            'manufacturer', 'model', 'part_number', 'tags',
+        )),
+    )
+
     class Meta:
         model = ModuleType
         fields = [
@@ -627,6 +633,15 @@ class ModuleForm(NetBoxModelForm):
         help_text="Automatically populate components associated with this module type"
     )
 
+    fieldsets = (
+        ('Module', (
+            'device', 'module_bay', 'manufacturer', 'module_type', 'tags',
+        )),
+        ('Hardware', (
+            'serial', 'asset_tag', 'replicate_components',
+        )),
+    )
+
     class Meta:
         model = Module
         fields = [