diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 5de39164be..e4fcd59857 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -449,9 +449,20 @@ export function getEntitySourceLocation(
 // @public (undocumented)
 export const GroupListPicker: (props: GroupListPickerProps) => JSX.Element;
 
+// @public (undocumented)
+export const GroupListPickerButton: (
+  props: GroupListPickerButtonProps,
+) => JSX.Element;
+
+// @public
+export type GroupListPickerButtonProps = {
+  handleClick: (event: React_2.MouseEvent<HTMLElement>) => void;
+  group: string;
+};
+
 // @public
 export type GroupListPickerProps = {
-  placeholder: string;
+  placeholder?: string;
   groupTypes: Array<string>;
   defaultGroup?: string;
 };
diff --git a/plugins/catalog-react/src/components/GroupListPicker/GroupListPicker.tsx b/plugins/catalog-react/src/components/GroupListPicker/GroupListPicker.tsx
index 76bfbed22c..404ce2fc6f 100644
--- a/plugins/catalog-react/src/components/GroupListPicker/GroupListPicker.tsx
+++ b/plugins/catalog-react/src/components/GroupListPicker/GroupListPicker.tsx
@@ -23,27 +23,7 @@ import Popover from '@material-ui/core/Popover';
 import { useApi } from '@backstage/core-plugin-api';
 import { ResponseErrorPanel } from '@backstage/core-components';
 import { GroupEntity } from '@backstage/catalog-model';
-import { makeStyles, Box, Typography } from '@material-ui/core';
-import KeyboardArrowDownIcon from '@material-ui/icons/KeyboardArrowDown';
-import PeopleIcon from '@material-ui/icons/People';
-
-const useStyles = makeStyles({
-  btn: {
-    backgroundColor: 'transparent',
-    border: 'none',
-    margin: 0,
-    padding: 0,
-    width: '100%',
-  },
-  title: {
-    fontSize: '24px',
-    fontStyle: 'normal',
-    fontWeight: 700,
-    letterSpacing: '-0.25px',
-    lineHeight: '32px',
-    marginBottom: 0,
-  },
-});
+import { GroupListPickerButton } from './GroupListPickerButton';
 
 /**
  * Props for {@link GroupListPicker}.
@@ -51,22 +31,21 @@ const useStyles = makeStyles({
  * @public
  */
 export type GroupListPickerProps = {
-  placeholder: string;
+  placeholder?: string;
   groupTypes: Array<string>;
   defaultGroup?: string;
 };
 
 /** @public */
 export const GroupListPicker = (props: GroupListPickerProps) => {
-  const classes = useStyles();
   const catalogApi = useApi(catalogApiRef);
 
-  const { placeholder, groupTypes, defaultGroup = '' } = props;
-  const [anchorEl, setAnchorEl] = React.useState(null);
+  const { groupTypes, defaultGroup = '', placeholder = '' } = props;
+  const [anchorEl, setAnchorEl] = React.useState<HTMLElement | null>(null);
   const [inputValue, setInputValue] = React.useState('');
   const [group, setGroup] = React.useState(defaultGroup);
 
-  const handleClick = (event: React.MouseEvent<any, MouseEvent>) => {
+  const handleClick = (event: React.MouseEvent<HTMLElement>) => {
     setAnchorEl(event.currentTarget);
   };
 
@@ -110,12 +89,16 @@ export const GroupListPicker = (props: GroupListPickerProps) => {
           loading={loading}
           options={groups ?? []}
           groupBy={option => option.spec.type}
-          getOptionLabel={option => option.spec.profile?.displayName ?? ''}
+          getOptionLabel={option =>
+            option.spec.profile?.displayName ?? option.metadata.name
+          }
           inputValue={inputValue}
           onInputChange={(_, value) => setInputValue(value)}
           onChange={(_, newValue) => {
             if (newValue) {
-              setGroup(newValue.spec.profile?.displayName ?? '');
+              setGroup(
+                newValue.spec.profile?.displayName ?? newValue.metadata.name,
+              );
             }
             setInputValue('');
           }}
@@ -129,24 +112,7 @@ export const GroupListPicker = (props: GroupListPickerProps) => {
           )}
         />
       </Popover>
-      <button
-        id={id}
-        style={{ cursor: 'pointer' }}
-        onClick={handleClick}
-        className={classes.btn}
-        data-testid="group-list-picker-button"
-      >
-        <Box display="flex" flexDirection="row" alignItems="center">
-          <PeopleIcon fontSize="large" style={(theme: BackstageTheme) => ({ marginRight: theme.spacing(1) }) } />
-          <Typography variant="h3" className={classes.title}>
-            {group}
-          </Typography>
-          <KeyboardArrowDownIcon
-            fontSize="large"
-            style={{ marginLeft: 'auto' }}
-          />
-        </Box>
-      </button>
+      <GroupListPickerButton handleClick={handleClick} group={group} />
     </>
   );
 };
diff --git a/plugins/catalog-react/src/components/GroupListPicker/GroupListPickerButton.tsx b/plugins/catalog-react/src/components/GroupListPicker/GroupListPickerButton.tsx
new file mode 100644
index 0000000000..a5a26ee9af
--- /dev/null
+++ b/plugins/catalog-react/src/components/GroupListPicker/GroupListPickerButton.tsx
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { BackstageTheme } from '@backstage/theme';
+import { Box, makeStyles, Typography } from '@material-ui/core';
+import KeyboardArrowDownIcon from '@material-ui/icons/KeyboardArrowDown';
+import PeopleIcon from '@material-ui/icons/People';
+
+const useStyles = makeStyles((theme: BackstageTheme) => ({
+  btn: {
+    backgroundColor: 'transparent',
+    border: 'none',
+    margin: 0,
+    padding: 0,
+    width: '100%',
+    cursor: 'pointer',
+  },
+  title: {
+    fontSize: '1.5rem',
+    fontStyle: 'normal',
+    fontWeight: theme.typography.fontWeightBold,
+    letterSpacing: '-0.25px',
+    lineHeight: '32px',
+    marginBottom: 0,
+  },
+  peopleIcon: {
+    marginRight: theme.spacing(1),
+  },
+  arrowDownIcon: {
+    marginLeft: 'auto',
+  },
+}));
+
+/**
+ * Props for {@link GroupListPickerButton}.
+ *
+ * @public
+ */
+export type GroupListPickerButtonProps = {
+  handleClick: (event: React.MouseEvent<HTMLElement>) => void;
+  group: string;
+};
+
+/** @public */
+export const GroupListPickerButton = (props: GroupListPickerButtonProps) => {
+  const { handleClick, group } = props;
+  const classes = useStyles();
+
+  return (
+    <button
+      onClick={handleClick}
+      className={classes.btn}
+      data-testid="group-list-picker-button"
+    >
+      <Box display="flex" flexDirection="row" alignItems="center">
+        <PeopleIcon fontSize="large" className={classes.peopleIcon} />
+        <Typography variant="h3" className={classes.title}>
+          {group}
+        </Typography>
+        <KeyboardArrowDownIcon
+          fontSize="large"
+          className={classes.arrowDownIcon}
+        />
+      </Box>
+    </button>
+  );
+};
diff --git a/plugins/catalog-react/src/components/GroupListPicker/index.ts b/plugins/catalog-react/src/components/GroupListPicker/index.ts
index fe1ba8e1ee..20c4502838 100644
--- a/plugins/catalog-react/src/components/GroupListPicker/index.ts
+++ b/plugins/catalog-react/src/components/GroupListPicker/index.ts
@@ -15,4 +15,6 @@
  */
 
 export { GroupListPicker } from './GroupListPicker';
+export { GroupListPickerButton } from './GroupListPickerButton';
 export type { GroupListPickerProps } from './GroupListPicker';
+export type { GroupListPickerButtonProps } from './GroupListPickerButton';