diff --git a/src/openforms/js/components/admin/form_design/variables/prefill/DefaultFields.js b/src/openforms/js/components/admin/form_design/variables/prefill/DefaultFields.js
index 3562162c49..49ebdd0bc0 100644
--- a/src/openforms/js/components/admin/form_design/variables/prefill/DefaultFields.js
+++ b/src/openforms/js/components/admin/form_design/variables/prefill/DefaultFields.js
@@ -11,7 +11,6 @@ import {get} from 'utils/fetch';
 
 import AttributeField from './AttributeField';
 import IdentifierRoleField from './IdentifierRoleField';
-import PluginField from './PluginField';
 import {ErrorsType} from './types';
 
 // Load the possible prefill attributes
@@ -52,18 +51,6 @@ const DefaultFields = ({errors}) => {
 
   return (
     <Fieldset>
-      <FormRow>
-        <Field
-          name="plugin"
-          label={
-            <FormattedMessage description="Variable prefill plugin label" defaultMessage="Plugin" />
-          }
-          errors={errors.plugin}
-        >
-          <PluginField />
-        </Field>
-      </FormRow>
-
       <FormRow>
         <Field
           name="attribute"
diff --git a/src/openforms/js/components/admin/form_design/variables/prefill/ObjectsAPIFields.js b/src/openforms/js/components/admin/form_design/variables/prefill/ObjectsAPIFields.js
index 24c386071b..d8af3e337f 100644
--- a/src/openforms/js/components/admin/form_design/variables/prefill/ObjectsAPIFields.js
+++ b/src/openforms/js/components/admin/form_design/variables/prefill/ObjectsAPIFields.js
@@ -24,7 +24,6 @@ import {FAIcon} from 'components/admin/icons';
 import ErrorBoundary from 'components/errors/ErrorBoundary';
 import {get} from 'utils/fetch';
 
-import PluginField from './PluginField';
 import {ErrorsType} from './types';
 
 const PLUGIN_ID = 'objects_api';
@@ -90,21 +89,6 @@ const ObjectsAPIFields = ({errors}) => {
   return (
     <>
       <Fieldset>
-        <FormRow>
-          <Field
-            name="plugin"
-            label={
-              <FormattedMessage
-                description="Variable prefill plugin label"
-                defaultMessage="Plugin"
-              />
-            }
-            errors={errors.plugin}
-          >
-            <PluginField />
-          </Field>
-        </FormRow>
-
         <ObjectsAPIGroup
           apiGroupChoices={apiGroups}
           onChangeCheck={() => {
diff --git a/src/openforms/js/components/admin/form_design/variables/prefill/PrefillConfigurationForm.js b/src/openforms/js/components/admin/form_design/variables/prefill/PrefillConfigurationForm.js
index eeaf4a3d64..2236202572 100644
--- a/src/openforms/js/components/admin/form_design/variables/prefill/PrefillConfigurationForm.js
+++ b/src/openforms/js/components/admin/form_design/variables/prefill/PrefillConfigurationForm.js
@@ -1,11 +1,16 @@
 import {Formik} from 'formik';
 import PropTypes from 'prop-types';
+import {FormattedMessage} from 'react-intl';
 
 import {SubmitAction} from 'components/admin/forms/ActionButton';
+import Field from 'components/admin/forms/Field';
+import Fieldset from 'components/admin/forms/Fieldset';
+import FormRow from 'components/admin/forms/FormRow';
 import SubmitRow from 'components/admin/forms/SubmitRow';
 
 import DefaultFields from './DefaultFields';
 import ObjectsAPIFields from './ObjectsAPIFields';
+import PluginField from './PluginField';
 
 const PLUGIN_COMPONENT_MAPPING = {
   objects_api: ObjectsAPIFields,
@@ -46,6 +51,23 @@ const PrefillConfigurationForm = ({
           PLUGIN_COMPONENT_MAPPING[values.plugin] ?? PLUGIN_COMPONENT_MAPPING.default;
         return (
           <>
+            <Fieldset extraClassName="module--spaceless">
+              <FormRow>
+                <Field
+                  name="plugin"
+                  label={
+                    <FormattedMessage
+                      description="Variable prefill plugin label"
+                      defaultMessage="Plugin"
+                    />
+                  }
+                  errors={errors.plugin}
+                >
+                  <PluginField />
+                </Field>
+              </FormRow>
+            </Fieldset>
+
             <PluginFormComponent errors={errors} />
 
             <SubmitRow>
diff --git a/src/openforms/scss/admin/_admin_theme.scss b/src/openforms/scss/admin/_admin_theme.scss
index 6bc203c6d3..e8f89a92fd 100644
--- a/src/openforms/scss/admin/_admin_theme.scss
+++ b/src/openforms/scss/admin/_admin_theme.scss
@@ -80,6 +80,10 @@ div.breadcrumbs {
   }
 }
 
+.module.module--spaceless {
+  margin-block-end: 0;
+}
+
 /* Important is used because Django templates include their own style, after ours */
 #changelist-filter {
   a:focus,