diff --git a/.changeset/olive-peaches-fly.md b/.changeset/olive-peaches-fly.md
new file mode 100644
index 0000000000..58dd3250df
--- /dev/null
+++ b/.changeset/olive-peaches-fly.md
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix the display of the description in `GitlabRepoPicker`:
+
+- Move `owner.description` helper text outside the `allowedOwners` conditional so it renders for both `Select` and `Autocomplete` modes.
+- Update the `Autocomplete` label to use `fields.gitlabRepoPicker.owner.inputTitle` instead of `fields.gitlabRepoPicker.owner.title`.
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
index 0e461d745a..6cf1825460 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.test.tsx
@@ -176,5 +176,42 @@ describe('GitlabRepoPicker', () => {
expect(onChange).toHaveBeenCalledWith({ owner: 'my-mock-owner' });
});
+
+ it('should render description if allowed owners are passed', async () => {
+ const { findByText } = await renderInTestApp(
+
+
+ ,
+ );
+
+ expect(
+ await findByText(
+ /GitLab namespace where this repository will belong to./,
+ ),
+ ).toBeInTheDocument();
+ });
+
+ it('should render description if no allowed owners are passed', async () => {
+ const { findByText } = await renderInTestApp(
+
+
+ ,
+ );
+
+ expect(
+ await findByText(
+ /GitLab namespace where this repository will belong to./,
+ ),
+ ).toBeInTheDocument();
+ });
});
});
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
index 0e869b44bf..0df4914983 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
@@ -139,9 +139,6 @@ export const GitlabRepoPicker = (
selected={owner}
items={ownerItems}
/>
-
- {t('fields.gitlabRepoPicker.owner.description')}
-
>
) : (
(
@@ -163,6 +160,9 @@ export const GitlabRepoPicker = (
autoSelect
/>
)}
+
+ {t('fields.gitlabRepoPicker.owner.description')}
+
>
);