diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index ef11f886..fd533229 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -198,6 +198,7 @@ Item {
                     chat.model.reply = undefined;
                 else
                     chat.model.edit = undefined;
+                TimelineManager.focusMessageInput();
             }
         }