diff --git a/ui/messages_view.go b/ui/messages_view.go
index e4f5acc..1dda71d 100644
--- a/ui/messages_view.go
+++ b/ui/messages_view.go
@@ -94,6 +94,8 @@ func (v *MessagesView) onInputCapture(e *tcell.EventKey) *tcell.EventKey {
 		return v.selectLastMessage(ms)
 	case "Esc":
 		v.selected = -1
+		v.app.view.ChannelsView.selected = nil
+
 		v.app.SetFocus(v.app.view)
 		v.
 			Clear().