diff --git a/zed/src/chat_panel.rs b/zed/src/chat_panel.rs
index 77c5a7777d1ae1a1b4f0570a54d247f90ed680a8..2b5570ca91d44a6c3ede872f43895f28f148110c 100644
--- a/zed/src/chat_panel.rs
+++ b/zed/src/chat_panel.rs
@@ -313,18 +313,22 @@ impl View for ChatPanel {
 
     fn render(&mut self, _: &mut RenderContext<Self>) -> ElementBox {
         let theme = &self.settings.borrow().theme;
-        Container::new(
-            Flex::column()
-                .with_child(
-                    Container::new(ChildView::new(self.channel_select.id()).boxed())
-                        .with_style(&theme.chat_panel.channel_select.container)
-                        .boxed(),
-                )
-                .with_child(self.render_active_channel_messages())
-                .with_child(self.render_input_box())
-                .boxed(),
+        ConstrainedBox::new(
+            Container::new(
+                Flex::column()
+                    .with_child(
+                        Container::new(ChildView::new(self.channel_select.id()).boxed())
+                            .with_style(&theme.chat_panel.channel_select.container)
+                            .boxed(),
+                    )
+                    .with_child(self.render_active_channel_messages())
+                    .with_child(self.render_input_box())
+                    .boxed(),
+            )
+            .with_style(&theme.chat_panel.container)
+            .boxed(),
         )
-        .with_style(&theme.chat_panel.container)
+        .with_min_width(150.)
         .boxed()
     }