diff --git a/ui.go b/ui.go
index 615f5d8..e5f9226 100644
--- a/ui.go
+++ b/ui.go
@@ -104,7 +104,7 @@ func onMainTreeViewSelected(n *tview.TreeNode) {
 			selectedChannel = c
 			app.SetFocus(messageInputField)
 
-			title := "#" + c.Name
+			title := genChannelRepr(c)
 			if c.Topic != "" {
 				title += " - " + c.Topic
 			}
@@ -127,7 +127,7 @@ func onMainTreeViewSelected(n *tview.TreeNode) {
 }
 
 func newTextChannelTreeNode(c *discordgo.Channel) *tview.TreeNode {
-	n := tview.NewTreeNode("[::d]#" + c.Name + "[::-]").
+	n := tview.NewTreeNode("[::d]" + genChannelRepr(c) + "[::-]").
 		SetReference(c.ID)
 
 	return n
diff --git a/util.go b/util.go
index d982386..a220a29 100644
--- a/util.go
+++ b/util.go
@@ -9,7 +9,7 @@ import (
 func genChannelRepr(c *discordgo.Channel) string {
 	var repr string
 	if c.Name != "" {
-		repr = c.Name
+		repr = "#" + c.Name
 	} else if len(c.Recipients) == 1 {
 		rp := c.Recipients[0]
 		repr = rp.Username + "#" + rp.Discriminator