diff --git a/ui.go b/ui.go
index e339841..21fa7de 100644
--- a/ui.go
+++ b/ui.go
@@ -388,7 +388,9 @@ func onMessageInputFieldInputCapture(e *tcell.EventKey) *tcell.EventKey {
 	case tcell.KeyEscape:
 		messageInputField.SetText("")
 		messageInputField.SetTitle("")
+
 		selectedMessage = 0
+		messagesView.Highlight()
 	}
 
 	return e