diff --git a/src/lib/components/event/event-detail-pills.svelte b/src/lib/components/event/event-detail-pills.svelte
index 6d110e734..988b25fbb 100644
--- a/src/lib/components/event/event-detail-pills.svelte
+++ b/src/lib/components/event/event-detail-pills.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
 
-  import Pill from '$lib/components/pill.svelte';
+  import PillContainer from '$lib/holocene/pill-container/pill-container.svelte';
+  import Pill from '$lib/holocene/pill-container/pill.svelte';
   import { translate } from '$lib/i18n/translate';
   import type { AttributeGrouping } from '$lib/utilities/format-event-attributes';
   import { attributeGroupingProperties } from '$lib/utilities/format-event-attributes';
 
   export let attributeGrouping: AttributeGrouping;
-  export let activePill: string;
 
   const dispatch = createEventDispatcher();
 
@@ -21,16 +21,15 @@
 
 {#if pillCount > 1}
   <div class="p-2 text-center xl:text-left">
-    <div class="pill-container">
+    <PillContainer>
       {#each Object.entries(attributeGrouping) as [key, value] (key)}
-        {@const active = activePill === key}
         {#if value.length}
-          <Pill {active} on:click={() => dispatch('pillChange', { key })}
+          <Pill id={key} onClick={() => dispatch('pillChange', { key })}
             >{translate(attributeGroupingProperties[key].label)}</Pill
           >
         {/if}
       {/each}
-    </div>
+    </PillContainer>
   </div>
 {/if}
 
diff --git a/src/lib/components/event/event-details-full.svelte b/src/lib/components/event/event-details-full.svelte
index 51d3800dd..6a79f8d41 100644
--- a/src/lib/components/event/event-details-full.svelte
+++ b/src/lib/components/event/event-details-full.svelte
@@ -37,11 +37,7 @@
       onGroupClick={handleGroupClick}
     />
     <div class="block w-full lg:w-2/3">
-      <EventDetailPills
-        {attributeGrouping}
-        {activePill}
-        on:pillChange={handlePillChange}
-      />
+      <EventDetailPills {attributeGrouping} on:pillChange={handlePillChange} />
       {#each eventDetails as [key, value] (key)}
         {#if attributeGrouping[activePill]?.includes(key)}
           <EventDetailsRowExpanded {key} {value} {attributes} class="w-full" />
@@ -51,11 +47,7 @@
   </div>
 {:else}
   <div class="w-full">
-    <EventDetailPills
-      {attributeGrouping}
-      {activePill}
-      on:pillChange={handlePillChange}
-    />
+    <EventDetailPills {attributeGrouping} on:pillChange={handlePillChange} />
     {#each eventDetails as [key, value] (key)}
       {#if attributeGrouping[activePill]?.includes(key)}
         <EventDetailsRowExpanded {key} {value} {attributes} class="w-full" />
diff --git a/src/lib/components/pill.svelte b/src/lib/components/pill.svelte
deleted file mode 100644
index 5fdbcbba3..000000000
--- a/src/lib/components/pill.svelte
+++ /dev/null
@@ -1,30 +0,0 @@
-<script lang="ts">
-  import { twMerge as merge } from 'tailwind-merge';
-
-  import type { IconName } from '$lib/holocene/icon';
-  import Icon from '$lib/holocene/icon/icon.svelte';
-
-  export let disabled = false;
-  export let loading = false;
-  export let active = false;
-  export let icon: IconName = null;
-  let className = '';
-  export { className as class };
-</script>
-
-<button
-  on:click|stopPropagation
-  class={merge(
-    'surface-subtle flex items-center justify-center gap-2 rounded-full px-3 py-1 text-sm',
-    active && 'bg-interactive text-white',
-    className,
-  )}
-  {disabled}
->
-  {#if icon}
-    <span class:animate-spin={loading}>
-      <Icon name={loading ? 'spinner' : icon} />
-    </span>
-  {/if}
-  <slot />
-</button>
diff --git a/src/lib/holocene/pill-container/pill-container.stories.svelte b/src/lib/holocene/pill-container/pill-container.stories.svelte
new file mode 100644
index 000000000..45e32500b
--- /dev/null
+++ b/src/lib/holocene/pill-container/pill-container.stories.svelte
@@ -0,0 +1,36 @@
+<script lang="ts" context="module">
+  import type { Meta } from '@storybook/svelte';
+
+  import PillContainer from './pill-container.svelte';
+  import Pill from './pill.svelte';
+
+  export const meta = {
+    title: 'Pill Container',
+    component: PillContainer,
+    subcomponents: { Pill },
+    argTypes: {
+      PILLS: {
+        name: 'Pill Container',
+        table: {
+          disable: true,
+        },
+      },
+    },
+  } satisfies Meta<Omit<PillContainer, 'PILLS'>>;
+</script>
+
+<script lang="ts">
+  import { Story, Template } from '@storybook/addon-svelte-csf';
+</script>
+
+<Template let:args>
+  <PillContainer {...args}>
+    <Pill id="A">Pill A</Pill>
+    <Pill id="B">Pill B</Pill>
+    <Pill id="C">Pill C</Pill>
+  </PillContainer>
+</Template>
+
+<Story name="Light" />
+
+<Story name="Dark" parameters={{ themes: { themeOverride: 'dark' } }} />
diff --git a/src/lib/holocene/pill-container/pill-container.svelte b/src/lib/holocene/pill-container/pill-container.svelte
new file mode 100644
index 000000000..bdd8b53f7
--- /dev/null
+++ b/src/lib/holocene/pill-container/pill-container.svelte
@@ -0,0 +1,53 @@
+<script lang="ts" context="module">
+  export type PillsContext = {
+    activePill: Writable<string>;
+    registerPill: (pill: string) => void;
+    selectPill: (pill: string) => void;
+  };
+
+  export const PILLS = {};
+</script>
+
+<script lang="ts">
+  import type { HTMLAttributes } from 'svelte/elements';
+  import { type Writable, writable } from 'svelte/store';
+
+  import { onDestroy, setContext } from 'svelte';
+  import { twMerge as merge } from 'tailwind-merge';
+
+  type $$Props = HTMLAttributes<HTMLDivElement>;
+
+  let className = '';
+  export { className as class };
+
+  const pills: string[] = [];
+  const activePill = writable<string>(null);
+
+  setContext<PillsContext>(PILLS, {
+    registerPill: (pill: string) => {
+      pills.push(pill);
+      activePill.update((current) => current || pill);
+
+      onDestroy(() => {
+        const i = pills.indexOf(pill);
+        pills.splice(i, 1);
+        activePill.update((current) =>
+          current === pill ? pills[i] || pills[pills.length - 1] : current,
+        );
+      });
+    },
+    selectPill: (pill: string) => {
+      activePill.set(pill);
+    },
+    activePill,
+  });
+</script>
+
+<div
+  class={merge(
+    'surface-subtle inline-flex flex-col items-center justify-start gap-2 rounded-md px-2 py-2 md:flex-row md:rounded-full',
+    className,
+  )}
+>
+  <slot />
+</div>
diff --git a/src/lib/holocene/pill-container/pill.svelte b/src/lib/holocene/pill-container/pill.svelte
new file mode 100644
index 000000000..8b16a01bf
--- /dev/null
+++ b/src/lib/holocene/pill-container/pill.svelte
@@ -0,0 +1,69 @@
+<script lang="ts">
+  import type { HTMLButtonAttributes } from 'svelte/elements';
+  import { noop } from 'svelte/internal';
+
+  import { getContext } from 'svelte';
+  import { twMerge as merge } from 'tailwind-merge';
+
+  import Badge from '$lib/holocene/badge.svelte';
+  import type { IconName } from '$lib/holocene/icon';
+  import Icon from '$lib/holocene/icon/icon.svelte';
+  import { isNull } from '$lib/utilities/is';
+
+  import { PILLS, type PillsContext } from './pill-container.svelte';
+
+  type $$Props = {
+    id: string;
+    onClick?: () => void;
+    disabled?: boolean;
+    loading?: boolean;
+    active?: boolean;
+    icon?: IconName;
+    count?: number;
+    class?: string;
+  } & HTMLButtonAttributes;
+
+  export let id: string;
+  export let onClick: () => void = noop;
+  export let disabled = false;
+  export let loading = false;
+  export let active: boolean = null;
+  export let icon: IconName = null;
+  export let count: number = null;
+  let className = '';
+  export { className as class };
+
+  const { activePill, registerPill, selectPill } =
+    getContext<PillsContext>(PILLS);
+
+  registerPill(id);
+
+  $: isActive = isNull(active) ? $activePill === id : active;
+
+  const handleClick = () => {
+    if (disabled) return;
+    selectPill(id);
+    onClick && onClick();
+  };
+</script>
+
+<button
+  on:click|stopPropagation={handleClick}
+  class={merge(
+    'surface-subtle flex items-center justify-center gap-2 rounded-full px-3 py-1 text-sm',
+    'focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-primary/70',
+    isActive && 'bg-interactive text-white',
+    className,
+  )}
+  {disabled}
+>
+  {#if icon}
+    <span class:animate-spin={loading}>
+      <Icon name={loading ? 'spinner' : icon} />
+    </span>
+  {/if}
+  <slot />
+  {#if !isNull(count)}
+    <Badge type="count">{count}</Badge>
+  {/if}
+</button>