diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index c65ed6410..2cc716060 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -353,11 +353,16 @@ class BaseScript:
         form.fields['_commit'].initial = getattr(self.Meta, 'commit_default', True)
 
         # Append the default fieldset if defined in the Meta class
-        default_fieldset = (('Script Execution Functions', ('_schedule_at', '_interval', '_commit')),)
-        if hasattr(self.Meta, 'fieldsets'):
-            self.Meta.fieldsets += default_fieldset
-        else:
-            pass
+        default_fieldset = (
+            ('Script Execution Parameters', ('_schedule_at', '_interval', '_commit')),
+        )
+        if not hasattr(self.Meta, 'fieldsets'):
+            fields = (
+                name for name, _ in self._get_vars().items()
+            )
+            self.Meta.fieldsets = (('Script Data', fields),)
+
+        self.Meta.fieldsets += default_fieldset
 
         return form