diff --git a/src/lib/components/IncidentItem.svelte b/src/lib/components/IncidentItem.svelte
index dff8897a..05f8465b 100644
--- a/src/lib/components/IncidentItem.svelte
+++ b/src/lib/components/IncidentItem.svelte
@@ -52,14 +52,14 @@
     </div>
 
     {#if incident.monitors && incident.monitors.length > 0 && !hideMonitors}
-      <div class="my-1 overflow-x-auto p-1">
-        <div class="flex gap-2">
+      <div class="my-1 p-1">
+        <div class="flex flex-wrap gap-2">
           {#each incident.monitors as monitor (`${incident.id}-${monitor.monitor_tag}`)}
             <Popover.Root>
               <Popover.Trigger disabled={isEmbedded}>
                 <Badge
                   variant="outline"
-                  class="border-{monitor.monitor_impact.toLowerCase()}   cursor-pointer rounded-none border-0 border-b px-0  text-sm font-normal"
+                  class="border-{monitor.monitor_impact.toLowerCase()}   max-w-full cursor-pointer rounded-none border-0 border-b px-0 text-sm font-normal wrap-anywhere whitespace-normal"
                 >
                   {monitor.monitor_name}
                 </Badge>
diff --git a/src/lib/components/MaintenanceItem.svelte b/src/lib/components/MaintenanceItem.svelte
index 65f20964..53011e1d 100644
--- a/src/lib/components/MaintenanceItem.svelte
+++ b/src/lib/components/MaintenanceItem.svelte
@@ -52,13 +52,13 @@
     {/if}
 
     {#if maintenance.monitors && maintenance.monitors.length > 0 && !hideMonitors}
-      <div class="flex gap-2">
+      <div class="flex flex-wrap gap-2">
         {#each maintenance.monitors as monitor}
           <Popover.Root>
             <Popover.Trigger disabled={isEmbedded}>
               <Badge
                 variant="outline"
-                class="border-{monitor.monitor_impact.toLowerCase()}   cursor-pointer rounded-none border-0 border-b px-0  text-sm font-normal"
+                class="border-{monitor.monitor_impact.toLowerCase()}   max-w-full cursor-pointer rounded-none border-0 border-b px-0 text-sm font-normal wrap-anywhere whitespace-normal"
               >
                 {monitor.monitor_name}
               </Badge>