diff --git a/zed/assets/themes/_base.toml b/zed/assets/themes/_base.toml
index 06b6346531af0a34b9222e4d49193d1decca4892..08d618aaed03999d9e799ed3e8e1ce9dec6fd953 100644
--- a/zed/assets/themes/_base.toml
+++ b/zed/assets/themes/_base.toml
@@ -24,9 +24,11 @@ color = "$text.0.color"
 
 [chat_panel]
 padding = { top = 10.0, bottom = 10.0, left = 10.0, right = 10.0 }
+channel_name = { extends = "$text.0", weight = "bold" }
+channel_name_hash = { text = "$text.2", padding.right = 5.0 }
 
 [chat_panel.message]
-body = "$text.0"
+body = "$text.1"
 sender.margin.right = 10.0
 sender.text = { extends = "$text.0", weight = "bold" }
 timestamp.text = "$text.2"
diff --git a/zed/assets/themes/dark.toml b/zed/assets/themes/dark.toml
index ce44b87e9646a9978af2296cd317658b42052bcd..9a8ac975bf2d0e1f8f80f23ba091d17b970649cb 100644
--- a/zed/assets/themes/dark.toml
+++ b/zed/assets/themes/dark.toml
@@ -6,7 +6,7 @@ extends = "_base"
 2 = "#131415"
 
 [text]
-base = { family = "Helvetica", size = 12.0 }
+base = { family = "Helvetica", size = 14.0 }
 0 = { extends = "$text.base", color = "#ffffff" }
 1 = { extends = "$text.base", color = "#b3b3b3" }
 2 = { extends = "$text.base", color = "#7b7d80" }
diff --git a/zed/src/channel.rs b/zed/src/channel.rs
index 02352ec00d0d0b03fcbd874ee8c538fcc847f4b5..f1f2e076077e5b38a7a036fab679d6b880d972d4 100644
--- a/zed/src/channel.rs
+++ b/zed/src/channel.rs
@@ -237,6 +237,10 @@ impl Channel {
         }
     }
 
+    pub fn name(&self) -> &str {
+        &self.details.name
+    }
+
     pub fn send_message(&mut self, body: String, cx: &mut ModelContext<Self>) -> Result<()> {
         let channel_id = self.details.id;
         let current_user_id = self.current_user_id()?;
diff --git a/zed/src/chat_panel.rs b/zed/src/chat_panel.rs
index d3b42604829bede5c973ec2a3298a1df6d6bff8d..03630ac6c8808857a82bbb54391f6e70f1f21d7d 100644
--- a/zed/src/chat_panel.rs
+++ b/zed/src/chat_panel.rs
@@ -99,6 +99,28 @@ impl ChatPanel {
         cx.notify();
     }
 
+    fn render_channel_name(&self, cx: &RenderContext<Self>) -> ElementBox {
+        let settings = self.settings.borrow();
+        let theme = &settings.theme.chat_panel;
+        if let Some((channel, _)) = self.active_channel.as_ref() {
+            let channel = channel.read(cx);
+            Flex::row()
+                .with_child(
+                    Container::new(
+                        Label::new("#".to_string(), theme.channel_name_hash.label.clone()).boxed(),
+                    )
+                    .with_style(&theme.channel_name_hash.container)
+                    .boxed(),
+                )
+                .with_child(
+                    Label::new(channel.name().to_string(), theme.channel_name.clone()).boxed(),
+                )
+                .boxed()
+        } else {
+            Empty::new().boxed()
+        }
+    }
+
     fn render_active_channel_messages(&self, cx: &RenderContext<Self>) -> ElementBox {
         let messages = if let Some((channel, _)) = self.active_channel.as_ref() {
             let channel = channel.read(cx);
@@ -184,6 +206,7 @@ impl View for ChatPanel {
         let theme = &self.settings.borrow().theme;
         Container::new(
             Flex::column()
+                .with_child(self.render_channel_name(cx))
                 .with_child(self.render_active_channel_messages(cx))
                 .with_child(self.render_input_box())
                 .boxed(),
diff --git a/zed/src/theme.rs b/zed/src/theme.rs
index 0346eba0e8086460a0f684c7c20f1be7383f5153..bb9b4b97abae2f5bf7d0910f7a219c8fd11c9a5a 100644
--- a/zed/src/theme.rs
+++ b/zed/src/theme.rs
@@ -62,6 +62,8 @@ pub struct ChatPanel {
     #[serde(flatten)]
     pub container: ContainerStyle,
     pub message: ChatMessage,
+    pub channel_name: TextStyle,
+    pub channel_name_hash: ContainedLabel,
 }
 
 #[derive(Deserialize)]