diff --git a/packages/app/src/components/ui/combobox-trigger.tsx b/packages/app/src/components/ui/combobox-trigger.tsx
index e3a0597bd..de26bf0c9 100644
--- a/packages/app/src/components/ui/combobox-trigger.tsx
+++ b/packages/app/src/components/ui/combobox-trigger.tsx
@@ -61,11 +61,15 @@ export const ComboboxTrigger = forwardRef<View, ComboboxTriggerProps>(function C
 
 const styles = StyleSheet.create((theme) => ({
   row: {
+    minWidth: 0,
+    maxWidth: "100%",
+    flexShrink: 1,
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[1],
   },
   chevronContainer: {
+    flexShrink: 0,
     transform: [{ translateY: 1 }],
   },
 }));
diff --git a/packages/app/src/screens/new-workspace-screen.tsx b/packages/app/src/screens/new-workspace-screen.tsx
index 3a9dd72ea..2aaf0cd62 100644
--- a/packages/app/src/screens/new-workspace-screen.tsx
+++ b/packages/app/src/screens/new-workspace-screen.tsx
@@ -2084,6 +2084,7 @@ const styles = StyleSheet.create((theme) => ({
     alignItems: "center",
     height: BADGE_HEIGHT,
     maxWidth: 240,
+    overflow: "hidden",
     paddingHorizontal: theme.spacing[2],
     borderRadius: theme.borderRadius["2xl"],
     gap: theme.spacing[1],
@@ -2115,6 +2116,7 @@ const styles = StyleSheet.create((theme) => ({
     opacity: 0.6,
   },
   badgeText: {
+    minWidth: 0,
     fontSize: theme.fontSize.sm,
     color: theme.colors.foregroundMuted,
     flexShrink: 1,