diff --git a/frontend/awx/access/roles/RoleForm.tsx b/frontend/awx/access/roles/RoleForm.tsx
index 2a91d74389..4b065eb451 100644
--- a/frontend/awx/access/roles/RoleForm.tsx
+++ b/frontend/awx/access/roles/RoleForm.tsx
@@ -41,13 +41,13 @@ export function CreateRole(props: { breadcrumbLabelForPreviousPage?: string }) {
   return (
     <PageLayout>
       <PageHeader
-        title={t('Create Role')}
+        title={t('Create role')}
         breadcrumbs={[
           {
             label: props.breadcrumbLabelForPreviousPage || t('Roles'),
             to: getPageUrl(AwxRoute.Roles),
           },
-          { label: t('Create Role') },
+          { label: t('Create role') },
         ]}
       />
       <AwxPageForm<AwxRbacRole>
@@ -100,13 +100,10 @@ export function EditRole(props: { breadcrumbLabelForPreviousPage?: string }) {
       return (
         <PageLayout>
           <PageHeader
-            title={t('Edit Role')}
+            title={role?.name ? t('Edit {{roleName}}', { roleName: role?.name }) : t('Roles')}
             breadcrumbs={[
-              {
-                label: props.breadcrumbLabelForPreviousPage || t('Roles'),
-                to: getPageUrl(AwxRoute.Roles),
-              },
-              { label: t('Edit Role') },
+              { label: t('Roles'), to: getPageUrl(AwxRoute.Roles) },
+              { label: role?.name ? t('Edit {{roleName}}', { roleName: role?.name }) : t('Roles') },
             ]}
           />
           <AwxPageForm<AwxRbacRole>