diff --git a/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx b/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx
index 1987864cff0..1e3448bacda 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarChipGroupContent.tsx
@@ -72,6 +72,7 @@ export class ToolbarChipGroupContent extends React.Component<ToolbarChipGroupCon
       <div
         className={css(
           styles.toolbarContent,
+          !collapseListedFilters && styles.modifiers.chipContainer,
           (numberOfFilters === 0 || isExpanded) && styles.modifiers.hidden,
           className
         )}
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap b/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap
index 8135d2d9540..7e27658c62a 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap
+++ b/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`ToolbarChipGroupContent should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v5-c-toolbar__content pf-m-hidden string"
+    class="pf-v5-c-toolbar__content pf-m-chip-container pf-m-hidden string"
     hidden=""
   >
     <div
diff --git a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
index 31e809b78b6..ed402cfa123 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
+++ b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
@@ -44,7 +44,7 @@ exports[`Toolbar should render inset 1`] = `
       </div>
     </div>
     <div
-      class="pf-v5-c-toolbar__content pf-m-hidden"
+      class="pf-v5-c-toolbar__content pf-m-chip-container pf-m-hidden"
       hidden=""
     >
       <div
@@ -395,7 +395,7 @@ exports[`Toolbar should render with page inset flag 1`] = `
       </div>
     </div>
     <div
-      class="pf-v5-c-toolbar__content pf-m-hidden"
+      class="pf-v5-c-toolbar__content pf-m-chip-container pf-m-hidden"
       hidden=""
     >
       <div