diff --git a/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx b/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx
index 3c46e6ba27..0b8fe8cd8c 100644
--- a/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx
+++ b/packages/core-components/src/components/HeaderIconLinkRow/HeaderIconLinkRow.tsx
@@ -25,8 +25,9 @@ const useStyles = makeStyles(
       margin: theme.spacing(2, 0),
       display: 'grid',
       gridAutoFlow: 'column',
-      gridAutoColumns: 'max-content',
+      gridAutoColumns: 'min-content',
       gridGap: theme.spacing(3),
+      wordBreak: 'keep-all',
     },
   }),
   { name: 'BackstageHeaderIconLinkRow' },