From da9779c0a6a22a8979d21bfccd20f22a19e18ebb Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Fri, 6 Mar 2026 08:06:14 +0100
Subject: [PATCH 1/4] Fix display of description

Signed-off-by: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
---
 .../components/fields/RepoUrlPicker/GitlabRepoPicker.tsx    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
index 0e869b44bf..2a428727e3 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}
             />
-            <FormHelperText>
-              {t('fields.gitlabRepoPicker.owner.description')}
-            </FormHelperText>
           </>
         ) : (
           <Autocomplete
@@ -163,6 +160,9 @@ export const GitlabRepoPicker = (
             autoSelect
           />
         )}
+        <FormHelperText>
+          {t('fields.gitlabRepoPicker.owner.description')}
+        </FormHelperText>
       </FormControl>
     </>
   );

From 3129718fb91e2c6cad6c46c56a7d18bfd17616d5 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Fri, 6 Mar 2026 08:06:20 +0100
Subject: [PATCH 2/4] Fix title

Signed-off-by: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
---
 .../src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
index 2a428727e3..0df4914983 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/GitlabRepoPicker.tsx
@@ -150,7 +150,7 @@ export const GitlabRepoPicker = (
             renderInput={params => (
               <TextField
                 {...params}
-                label={t('fields.gitlabRepoPicker.owner.title')}
+                label={t('fields.gitlabRepoPicker.owner.inputTitle')}
                 disabled={isDisabled}
                 required
               />

From 864a7993b219764e22d48077315cc4ff82994e69 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Fri, 6 Mar 2026 08:18:54 +0100
Subject: [PATCH 3/4] Add changeset

Signed-off-by: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
---
 .changeset/olive-peaches-fly.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .changeset/olive-peaches-fly.md

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`.

From a6b90538ef7ba0c25b571fcf12e137afbb1331f9 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Tue, 10 Mar 2026 08:18:30 +0100
Subject: [PATCH 4/4] Add test case

Signed-off-by: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
---
 .../RepoUrlPicker/GitlabRepoPicker.test.tsx   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

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(
+        <TestApiProvider apis={[[scaffolderApiRef, scaffolderApiMock]]}>
+          <GitlabRepoPicker
+            onChange={jest.fn()}
+            rawErrors={[]}
+            state={{ repoName: 'repo' }}
+            allowedOwners={['owner1']}
+          />
+        </TestApiProvider>,
+      );
+
+      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(
+        <TestApiProvider apis={[[scaffolderApiRef, scaffolderApiMock]]}>
+          <GitlabRepoPicker
+            onChange={jest.fn()}
+            rawErrors={[]}
+            state={{ repoName: 'repo' }}
+          />
+        </TestApiProvider>,
+      );
+
+      expect(
+        await findByText(
+          /GitLab namespace where this repository will belong to./,
+        ),
+      ).toBeInTheDocument();
+    });
   });
 });