diff --git a/cmd/guilds_tree.go b/cmd/guilds_tree.go
index 9507ddc..bc09e0c 100644
--- a/cmd/guilds_tree.go
+++ b/cmd/guilds_tree.go
@@ -164,9 +164,6 @@ PARENT_CHANNELS:
 }
 
 func (gt *guildsTree) onSelected(node *tview.TreeNode) {
-	gt.selectedChannelID = 0
-
-	app.messagesText.reset()
 	app.messageInput.reset()
 
 	if len(node.GetChildren()) != 0 {
@@ -196,6 +193,7 @@ func (gt *guildsTree) onSelected(node *tview.TreeNode) {
 			return
 		}
 
+		app.messagesText.reset()
 		app.messagesText.drawMsgs(channel.ID)
 		app.messagesText.
 			ScrollToEnd().
diff --git a/cmd/messages_text.go b/cmd/messages_text.go
index 9923f95..65fc2f9 100644
--- a/cmd/messages_text.go
+++ b/cmd/messages_text.go
@@ -74,8 +74,6 @@ func (mt *messagesText) drawMsgs(cID discord.ChannelID) {
 		}
 	}
 
-	mt.Clear()
-
 	for _, m := range slices.Backward(msgs) {
 		mt.createMsg(m)
 	}
@@ -85,9 +83,10 @@ func (mt *messagesText) reset() {
 	mt.selectedMessageID = 0
 	app.messageInput.replyMessageID = 0
 
-	mt.SetTitle("")
-	mt.Clear()
-	mt.Highlight()
+	mt.
+		Clear().
+		Highlight().
+		SetTitle("")
 }
 
 // Region tags are square brackets that contain a region ID in double quotes
diff --git a/cmd/state.go b/cmd/state.go
index b8fe40d..bf02a5c 100644
--- a/cmd/state.go
+++ b/cmd/state.go
@@ -120,9 +120,8 @@ func onMessageCreate(m *gateway.MessageCreateEvent) {
 
 func onMessageDelete(m *gateway.MessageDeleteEvent) {
 	if app.guildsTree.selectedChannelID == m.ChannelID {
-		app.messagesText.selectedMessageID = 0
-		app.messagesText.Highlight()
-		app.messagesText.Clear()
+		app.messagesText.reset()
 		app.messagesText.drawMsgs(m.ChannelID)
+		app.Draw()
 	}
 }