diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py
index 56a0861ea..998564498 100644
--- a/netbox/core/forms/filtersets.py
+++ b/netbox/core/forms/filtersets.py
@@ -75,12 +75,14 @@ class JobFilterForm(SavedFiltersMixin, FilterForm):
     model = Job
     fieldsets = (
         FieldSet('q', 'filter_id'),
-        FieldSet('object_type_id', 'status', 'queue_name', name=_('Attributes')),
+        FieldSet('object_type_id', 'status', 'queue_name', 'user', name=_('Attributes')),
         FieldSet(
             'created__before', 'created__after', 'scheduled__before', 'scheduled__after', 'started__before',
-            'started__after', 'completed__before', 'completed__after', 'user', name=_('Creation')
+            'started__after', name=_('Scheduling')
+        ),
+        FieldSet(
+            'completed__before', 'completed__after', 'execution_time__gte', 'execution_time__lte', name=_('Execution'),
         ),
-        FieldSet('execution_time__gte', 'execution_time__lte', name=_('Execution')),
     )
     object_type_id = ContentTypeChoiceField(
         label=_('Object Type'),