diff --git a/guilds_tree.go b/guilds_tree.go
index a955865..55845ca 100644
--- a/guilds_tree.go
+++ b/guilds_tree.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"log"
 	"sort"
 
@@ -12,7 +11,8 @@ import (
 type GuildsTree struct {
 	*tview.TreeView
 
-	root *tview.TreeNode
+	root            *tview.TreeNode
+	selectedChannel *discord.Channel
 }
 
 func newGuildsTree() *GuildsTree {
@@ -135,6 +135,9 @@ func (gt *GuildsTree) onSelected(n *tview.TreeNode) {
 			return
 		}
 
+		gt.selectedChannel = c
+		messagesText.SetTitle(gt.channelToString(*c))
+
 		ms, err := discordState.Messages(ref, cfg.MessagesLimit)
 		if err != nil {
 			log.Println(err)
@@ -143,12 +146,11 @@ func (gt *GuildsTree) onSelected(n *tview.TreeNode) {
 
 		for i := len(ms) - 1; i >= 0; i-- {
 			if messagesText.newMessage(&ms[i]); err != nil {
-				fmt.Println(err)
+				log.Println(err)
 				continue
 			}
 		}
 
-		messagesText.SetTitle(gt.channelToString(*c))
 		app.SetFocus(messagesText)
 	}
 }
diff --git a/messages_text.go b/messages_text.go
index 5ea5436..92b151e 100644
--- a/messages_text.go
+++ b/messages_text.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"bytes"
+	"fmt"
 	"time"
 
 	"github.com/diamondburned/arikawa/v3/discord"
@@ -10,8 +10,6 @@ import (
 
 type MessagesText struct {
 	*tview.TextView
-
-	buffer bytes.Buffer
 }
 
 func newMessagesText() *MessagesText {
@@ -36,20 +34,18 @@ func (mt *MessagesText) newMessage(m *discord.Message) error {
 	case discord.DefaultMessage, discord.InlinedReplyMessage:
 		// Region tags are square brackets that contain a region ID in double quotes
 		// https://pkg.go.dev/github.com/rivo/tview#hdr-Regions_and_Highlights
-		mt.buffer.WriteString(`["`)
-		mt.buffer.WriteString(m.ID.String())
-		mt.buffer.WriteString(`"]`)
+		fmt.Fprintf(mt, `["%s"]`, m.ID)
 
 		if m.ReferencedMessage != nil {
-			mt.buffer.WriteString("> [::d]")
+			fmt.Fprint(mt, "> [::d]")
 
 			// Author
 			mt.newAuthor(m.ReferencedMessage)
 			// Content
 			mt.newContent(m.ReferencedMessage)
 
-			mt.buffer.WriteString("[::-]")
-			mt.buffer.WriteByte('\n')
+			fmt.Fprint(mt, "[::-]")
+			fmt.Fprintln(mt)
 		}
 
 		// Author
@@ -57,31 +53,25 @@ func (mt *MessagesText) newMessage(m *discord.Message) error {
 		// Timestamps
 		mt.newTimestamp(m)
 		// Content
-		mt.buffer.WriteByte('\n')
+		fmt.Fprintln(mt)
 		mt.newContent(m)
 
 		// Tags with no region ID ([""]) don't start new regions. They can therefore be used to mark the end of a region.
-		mt.buffer.WriteString(`[""]`)
+		fmt.Fprint(mt, `[""]`)
 	}
 
-	mt.buffer.WriteString("\n\n")
-
-	_, err := mt.buffer.WriteTo(mt)
-	return err
+	fmt.Fprint(mt, "\n\n")
+	return nil
 }
 
 func (mt *MessagesText) newAuthor(m *discord.Message) {
-	mt.buffer.WriteString("[blue]")
-	mt.buffer.WriteString(m.Author.Username)
-	mt.buffer.WriteString("[-] ")
+	fmt.Fprintf(mt, "[blue]%s[-] ", m.Author.Username)
 }
 
 func (mt *MessagesText) newTimestamp(m *discord.Message) {
-	mt.buffer.WriteString("[::d]")
-	mt.buffer.WriteString(m.Timestamp.Format(time.Kitchen))
-	mt.buffer.WriteString("[-:-:-] ")
+	fmt.Fprintf(mt, "[::d]%s[::-]", m.Timestamp.Format(time.Kitchen))
 }
 
 func (mt *MessagesText) newContent(m *discord.Message) {
-	mt.buffer.WriteString(tview.Escape(m.Content))
+	fmt.Fprint(mt, tview.Escape(m.Content))
 }
diff --git a/state.go b/state.go
index bc9fe73..3d54e42 100644
--- a/state.go
+++ b/state.go
@@ -18,6 +18,7 @@ func newState(token string) *State {
 	}
 
 	s.AddHandler(s.onReady)
+	s.AddHandler(s.onMessageCreate)
 
 	return s
 }
@@ -49,3 +50,12 @@ func (s *State) onReady(r *gateway.ReadyEvent) {
 	guildsTree.SetCurrentNode(guildsTree.root)
 	app.SetFocus(guildsTree)
 }
+
+func (s *State) onMessageCreate(m *gateway.MessageCreateEvent) {
+	if guildsTree.selectedChannel != nil {
+		if err := messagesText.newMessage(&m.Message); err != nil {
+			log.Println(err)
+			return
+		}
+	}
+}