diff --git a/ui.go b/ui.go
index 2b258a0..94d876a 100644
--- a/ui.go
+++ b/ui.go
@@ -257,6 +257,10 @@ func onMessageInputFieldInputCapture(e *tcell.EventKey) *tcell.EventKey {
 			}
 
 			go session.ChannelMessageSendComplex(m.ChannelID, d)
+
+			selectedMessage = -1
+			messagesView.Highlight()
+
 			messageInputField.SetTitle("")
 		} else {
 			go session.ChannelMessageSend(selectedChannel.ID, t)