diff --git a/apps/client/src/theme.ts b/apps/client/src/theme.ts
index 55367a134..9aaad79e3 100644
--- a/apps/client/src/theme.ts
+++ b/apps/client/src/theme.ts
@@ -1,4 +1,5 @@
 import {
+  Badge,
   createTheme,
   CSSVariablesResolver,
   MantineColorsTuple,
@@ -38,6 +39,15 @@ export const theme = createTheme({
     red,
   },
   components: {
+    // Size badges to their content; fit-content collapses inside table cells.
+    Badge: Badge.extend({
+      styles: (_theme, props) => ({
+        root:
+          props.fullWidth || props.circle
+            ? {}
+            : { width: "max-content", maxWidth: "100%" },
+      }),
+    }),
     Tabs: Tabs.extend({
       vars: (theme, props) => ({
         root: {