diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 819a3dc4f67ef5bbcf71ebbaf052e6529e108c11..eaa3eb8261d7fb6f80cda8f8500380cbe4303681 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -2364,7 +2364,7 @@ fn build_initial_channels_update(
         update.channels.push(proto::Channel {
             id: channel.id.to_proto(),
             name: channel.name,
-            parent_id: None,
+            parent_id: channel.parent_id.map(|id| id.to_proto()),
         });
     }
 
diff --git a/crates/collab_ui/src/panel.rs b/crates/collab_ui/src/panel.rs
index bca0da6176f6eca97bce8581d0f8deff283eb8dd..1973ddd9f6d492130ca03db0e5bde0976d5ce551 100644
--- a/crates/collab_ui/src/panel.rs
+++ b/crates/collab_ui/src/panel.rs
@@ -511,7 +511,7 @@ impl CollabPanel {
         self.entries.push(ListEntry::Header(Section::Channels, 0));
 
         let channels = channel_store.channels();
-        if !channels.is_empty() {
+        if !(channels.is_empty() && self.channel_editing_state.is_none()) {
             self.match_candidates.clear();
             self.match_candidates
                 .extend(
@@ -1291,7 +1291,7 @@ impl CollabPanel {
                 .with_height(theme.row_height)
                 .contained()
                 .with_style(*theme.contact_row.in_state(is_selected).style_for(state))
-                .with_margin_left(10. * channel.depth as f32)
+                .with_margin_left(20. * channel.depth as f32)
         })
         .on_click(MouseButton::Left, move |_, this, cx| {
             this.join_channel(channel_id, cx);