diff --git a/app/components/Chip.tsx b/app/components/Chip.tsx
index 55903ee..f39283c 100644
--- a/app/components/Chip.tsx
+++ b/app/components/Chip.tsx
@@ -17,7 +17,7 @@ export default function Chip({
 	return (
 		<span
 			className={cn(
-				'h-5 text-xs py-0.5 px-1 rounded-md',
+				'h-5 text-xs py-0.5 px-1 rounded-md text-nowrap',
 				'text-headplane-700 dark:text-headplane-100',
 				'bg-headplane-100 dark:bg-headplane-700',
 				'inline-flex items-center gap-x-1',
diff --git a/app/routes/machines/components/machine-row.tsx b/app/routes/machines/components/machine-row.tsx
index e3ad4cc..2aa2131 100644
--- a/app/routes/machines/components/machine-row.tsx
+++ b/app/routes/machines/components/machine-row.tsx
@@ -64,7 +64,7 @@ export default function MachineRow({
 						{node.givenName}
 					</p>
 					<p className="text-sm opacity-50">{node.user.name}</p>
-					<div className="flex gap-1 mt-1.5">
+					<div className="flex gap-1 flex-wrap mt-1.5">
 						{mapTagsToComponents(node, uiTags)}
 						{node.validTags.map((tag) => (
 							<Chip key={tag} text={tag} />