diff --git a/app/src/settings_view/ai_page.rs b/app/src/settings_view/ai_page.rs
index cf22dd2e3a..4c1cd96255 100644
--- a/app/src/settings_view/ai_page.rs
+++ b/app/src/settings_view/ai_page.rs
@@ -22,6 +22,7 @@ use warpui::elements::{
 use warpui::fonts::{Properties, Weight};
 use warpui::keymap::{ContextPredicate, Keystroke};
 use warpui::platform::Cursor;
+use warpui::text_layout::ClipConfig;
 use warpui::ui_components::button::ButtonVariant;
 use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
 use warpui::ui_components::slider::SliderStateHandle;
@@ -7488,13 +7489,18 @@ impl ApiKeysWidget {
                 appearance.ui_font_family(),
                 appearance.ui_font_size(),
             )
+            .with_clip(ClipConfig::ellipsis())
             .with_style(Properties::default().weight(Weight::Semibold))
             .with_color(text_color.into())
             .finish();
 
             let left = Flex::column()
                 .with_spacing(8.)
-                .with_child(endpoint_name)
+                .with_child(
+                    ConstrainedBox::new(endpoint_name)
+                        .with_max_width(320.)
+                        .finish(),
+                )
                 .with_child(chips)
                 .finish();
 
diff --git a/app/src/settings_view/mod.rs b/app/src/settings_view/mod.rs
index 3e6204d180..d732447f4f 100644
--- a/app/src/settings_view/mod.rs
+++ b/app/src/settings_view/mod.rs
@@ -38,7 +38,7 @@ use warpui::elements::{
     ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DispatchEventResult, Empty,
     EventHandler, Expanded, Fill, Flex, MainAxisSize, OffsetPositioning, ParentAnchor,
     ParentElement, ParentOffsetBounds, Radius, SavePosition, ScrollbarWidth, Shrinkable, Stack,
-    Text,
+    Text, Wrap,
 };
 use warpui::fonts::{Properties, Weight};
 use warpui::keymap::{ContextPredicate, EnabledPredicate, FixedBinding};
@@ -203,7 +203,7 @@ pub(super) fn render_model_chips(
         ..Default::default()
     };
 
-    let mut chips = Flex::row().with_spacing(8.);
+    let mut chips = Wrap::row().with_spacing(8.).with_run_spacing(8.);
     for label in labels {
         chips.add_child(Chip::new(label, chip_style).build().finish());
     }
diff --git a/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs b/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs
index 657e3dca52..8cc93c3eeb 100644
--- a/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs
+++ b/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs
@@ -1,8 +1,10 @@
 use warp_core::ui::theme::color::internal_colors;
 use warpui::elements::{
-    Border, ChildView, Container, CornerRadius, Dismiss, Empty, Flex, ParentElement, Radius, Text,
+    Border, ChildView, ConstrainedBox, Container, CornerRadius, Dismiss, Empty, Flex,
+    ParentElement, Radius, Text,
 };
 use warpui::fonts::{Properties, Weight};
+use warpui::text_layout::ClipConfig;
 use warpui::ui_components::components::UiComponent;
 use warpui::{
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
@@ -106,6 +108,7 @@ impl View for RemoveCustomEndpointConfirmationDialog {
             appearance.ui_font_family(),
             appearance.ui_font_size(),
         )
+        .with_clip(ClipConfig::ellipsis())
         .with_style(Properties::default().weight(Weight::Semibold))
         .with_color(theme.active_ui_text_color().into())
         .finish();
@@ -119,7 +122,11 @@ impl View for RemoveCustomEndpointConfirmationDialog {
         let endpoint_card = Container::new(
             Flex::column()
                 .with_spacing(8.)
-                .with_child(endpoint_title)
+                .with_child(
+                    ConstrainedBox::new(endpoint_title)
+                        .with_max_width(360.)
+                        .finish(),
+                )
                 .with_child(chips)
                 .finish(),
         )