diff --git a/packages/react-core/src/helpers/util.ts b/packages/react-core/src/helpers/util.ts
index 344984897d9..e3e044cf91d 100644
--- a/packages/react-core/src/helpers/util.ts
+++ b/packages/react-core/src/helpers/util.ts
@@ -257,7 +257,7 @@ export const formatBreakpointMods = (
   breakpointMods
     .map(mod => `${mod.modifier}${mod.breakpoint ? `-on-${mod.breakpoint}` : ''}`)
     .map(toCamel)
-    .map(mod => mod.replace(/-2xl$/gi, '_2xl'))
+    .map(mod => mod.replace(/-(\dxl)$/gi, (_res, group) => `_${group}`))
     .map(modifierKey => styles.modifiers[modifierKey])
     .filter(Boolean)
     .join(' ');