diff --git a/crates/agent/src/message_editor.rs b/crates/agent/src/message_editor.rs
index 573e4b4d036f1bf80f37dc47472fcac6b95df9ba..6c1c76b26e75c2da1a4ed84ef9d894c12420d16f 100644
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -93,6 +93,7 @@ impl MessageEditor {
             );
             editor.set_placeholder_text("Ask anything, @ to mention, ↑ to select", cx);
             editor.set_show_indent_guides(false, cx);
+            editor.set_soft_wrap();
             editor.set_context_menu_options(ContextMenuOptions {
                 min_entries_visible: 12,
                 max_entries_visible: 12,