diff --git a/frontend/src/app/main/ui/workspace/tokens/management/token_tree.scss b/frontend/src/app/main/ui/workspace/tokens/management/token_tree.scss
index 87ef7f2e4d..ee686c5f8e 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management/token_tree.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/management/token_tree.scss
@@ -22,10 +22,6 @@
       margin-block-end: var(--sp-s);
     }
   }
-
-  & .token-pill {
-    flex: 0 0 auto;
-  }
 }
 
 .node-parent {
@@ -37,7 +33,9 @@
   padding-inline-start: var(--sp-s);
   border-inline-start: $b-2 solid var(--color-background-quaternary);
 
-  &:has(> button) {
+  // Match pills as "not a group" so the rule does not depend on the
+  // pill's own markup, which lives in another module.
+  &:has(> :not(.node-parent)) {
     display: flex;
     flex-wrap: wrap;
     gap: var(--sp-xs);
@@ -50,8 +48,4 @@
       margin-block-end: var(--sp-s);
     }
   }
-
-  & .token-pill {
-    flex: 0 0 auto;
-  }
 }