diff --git a/packages/ui/src/components/overflow-badge.tsx b/packages/ui/src/components/overflow-badge.tsx
index 253597ea8..966ff3792 100644
--- a/packages/ui/src/components/overflow-badge.tsx
+++ b/packages/ui/src/components/overflow-badge.tsx
@@ -19,23 +19,43 @@ export function OverflowBadge({
     radius: "sm",
     ...props,
   };
-  return (
-    <Popover width="content" shadow="md" disabled={disablePopover}>
+
+  const hasOverflow = data.length > overflowCount;
+
+  const badges = data.slice(0, overflowCount).map((item) => (
+    <Badge key={item} px="xs" {...badgeProps}>
+      {item}
+    </Badge>
+  ));
+
+  const overflowTrigger = hasOverflow ? (
+    <UnstyledButton display="flex">
+      <Badge px="xs" style={{ cursor: "pointer", ...badgeProps.style }} {...badgeProps}>
+        +{data.length - overflowCount}
+      </Badge>
+    </UnstyledButton>
+  ) : null;
+
+  // Mantine mounts a Popover's machinery — the Popover itself plus its Dropdown — regardless of
+  // `disabled`, and this component previously mounted both even when nothing overflowed, which is the
+  // common case. That made it a per-row cost anywhere it appears in a list: this is shared UI, used by
+  // media-releases (which passes `disablePopover`), releases, and the widget inputs. Returning the
+  // badges directly when there is no popover to show keeps the rendered markup identical — a disabled
+  // Popover.Target only forwards a ref — while creating none of the overlay components.
+  if (disablePopover || !hasOverflow) {
+    return (
       <Group gap={groupGap}>
-        {data.slice(0, overflowCount).map((item) => (
-          <Badge key={item} px="xs" {...badgeProps}>
-            {item}
-          </Badge>
-        ))}
-        {data.length > overflowCount && (
-          <Popover.Target>
-            <UnstyledButton display="flex">
-              <Badge px="xs" style={{ cursor: "pointer", ...badgeProps.style }} {...badgeProps}>
-                +{data.length - overflowCount}
-              </Badge>
-            </UnstyledButton>
-          </Popover.Target>
-        )}
+        {badges}
+        {overflowTrigger}
+      </Group>
+    );
+  }
+
+  return (
+    <Popover width="content" shadow="md">
+      <Group gap={groupGap}>
+        {badges}
+        <Popover.Target>{overflowTrigger}</Popover.Target>
       </Group>
       <Popover.Dropdown>
         <Stack>
diff --git a/packages/widgets/src/beszel/_shared/disk-usage.tsx b/packages/widgets/src/beszel/_shared/disk-usage.tsx
index 9aa2a14ad..7a7891ad2 100644
--- a/packages/widgets/src/beszel/_shared/disk-usage.tsx
+++ b/packages/widgets/src/beszel/_shared/disk-usage.tsx
@@ -22,6 +22,24 @@ export const DiskUsage = ({ system, fontSize, progressSize, valueMiw, valueGap =
   const dotSize = progressSize === "xs" ? 2 : 3;
   const dotGap = 2;
 
+  // Mantine mounts a HoverCard's Popover machinery even when it is disabled, and this component
+  // renders per table row. A system reporting no extra filesystems has nothing to show on hover — it
+  // already fell back to a plain bar inside the target — so the whole overlay was created for nothing.
+  if (filesystems.length === 0) {
+    return (
+      <Group gap={valueGap} wrap="nowrap" style={{ flex: 1, minWidth: 0, marginLeft: "auto" }}>
+        <Text size={fontSize} fw={500} w={valueMiw} ta="left" style={{ whiteSpace: "nowrap", flexShrink: 0 }}>
+          {formatPercent(system.disk)}
+        </Text>
+        <Box style={{ display: "flex", alignItems: "center", flex: 1, minWidth: 24 }}>
+          <Box pos="relative" style={{ flex: 1, minWidth: 24 }}>
+            <Progress value={system.disk} color={thresholdColor(system.disk)} size={trackSize} />
+          </Box>
+        </Box>
+      </Group>
+    );
+  }
+
   return (
     <Group gap={valueGap} wrap="nowrap" style={{ flex: 1, minWidth: 0, marginLeft: "auto" }}>
       <Text size={fontSize} fw={500} w={valueMiw} ta="left" style={{ whiteSpace: "nowrap", flexShrink: 0 }}>
@@ -33,11 +51,9 @@ export const DiskUsage = ({ system, fontSize, progressSize, valueMiw, valueGap =
         shadow="md"
         openDelay={200}
         closeDelay={100}
-        disabled={filesystems.length === 0}
       >
         <HoverCard.Target>
-          {filesystems.length > 0 ? (
-            <UnstyledButton
+          <UnstyledButton
               aria-label={`Show usage for ${filesystems.length + 1} filesystems`}
               style={{
                 display: "flex",
@@ -73,14 +89,7 @@ export const DiskUsage = ({ system, fontSize, progressSize, valueMiw, valueGap =
                   ))}
                 </Group>
               </Box>
-            </UnstyledButton>
-          ) : (
-            <Box style={{ display: "flex", alignItems: "center", flex: 1, minWidth: 24 }}>
-              <Box pos="relative" style={{ flex: 1, minWidth: 24 }}>
-                <Progress value={system.disk} color={thresholdColor(system.disk)} size={trackSize} />
-              </Box>
-            </Box>
-          )}
+          </UnstyledButton>
         </HoverCard.Target>
         <HoverCard.Dropdown p={8}>
           <Stack gap={6} miw={145}>