diff --git a/ui/app.go b/ui/app.go
index e0b4b28..ad5c8f2 100644
--- a/ui/app.go
+++ b/ui/app.go
@@ -164,11 +164,12 @@ func (app *App) onStateReady(r *gateway.ReadyEvent) {
 }
 
 func (app *App) onStateGuildCreate(g *gateway.GuildCreateEvent) {
-	rootNode := app.GuildsTree.GetRoot()
 	guildNode := tview.NewTreeNode(g.Name)
 	guildNode.SetReference(g.ID)
 
+	rootNode := app.GuildsTree.GetRoot()
 	rootNode.AddChild(guildNode)
+
 	app.Draw()
 }
 
diff --git a/ui/messages.go b/ui/messages.go
index 861c69e..8e1d124 100644
--- a/ui/messages.go
+++ b/ui/messages.go
@@ -174,6 +174,9 @@ func NewMessageActionsList(app *App, m *discord.Message) *MessageActionsList {
 			for _, l := range links {
 				go open.Run(l)
 			}
+
+			app.SetRoot(app.MainFlex, true)
+			app.SetFocus(app.MessagesTextView)
 		})
 	}