diff --git a/.changeset/spicy-lies-listen.md b/.changeset/spicy-lies-listen.md
new file mode 100644
index 0000000000..6bc5e95846
--- /dev/null
+++ b/.changeset/spicy-lies-listen.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix helper text margin for scaffolder EntityNamePicker and EntityTagsPicker when using outlined text field
diff --git a/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx b/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
index bc3ca95ae0..9f49fc2b94 100644
--- a/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityNamePicker/EntityNamePicker.tsx
@@ -46,6 +46,7 @@ export const EntityNamePicker = (props: EntityNamePickerProps) => {
       margin="normal"
       error={rawErrors?.length > 0 && !formData}
       inputProps={{ autoFocus }}
+      FormHelperTextProps={{ margin: 'dense', style: { marginLeft: 0 } }}
     />
   );
 };
diff --git a/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx b/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx
index 876b5c161d..bf95a08c85 100644
--- a/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityTagsPicker/EntityTagsPicker.tsx
@@ -116,6 +116,7 @@ export const EntityTagsPicker = (props: EntityTagsPickerProps) => {
               helperText ??
               "Add any relevant tags, hit 'Enter' to add new tags. Valid format: [a-z0-9+#] separated by [-], at most 63 characters"
             }
+            FormHelperTextProps={{ margin: 'dense', style: { marginLeft: 0 } }}
           />
         )}
       />