2 files changed, 6 insertions, 3 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index f6bd8396..01bc3169 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -28,6 +28,7 @@ import org.kube.framework 1.0 as Kube
 Kube.View {
     id: root
 
+    property bool newMessage: false
     property bool loadAsDraft: false
     property variant message: {}
 
@@ -46,6 +47,8 @@ Kube.View {
     function loadMessage(message, loadAsDraft) {
         if (message) {
             composerController.loadMessage(message, loadAsDraft)
+        } else if (newMessage) {
+            subject.forceActiveFocus()
         }
     }
 
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 21c6f4fd..e5a78753 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -55,7 +55,7 @@ Controls2.ApplicationWindow {
 
     Kube.Listener {
         filter: Kube.Messages.compose
-        onMessageReceived: kubeViews.openComposer()
+        onMessageReceived: kubeViews.openComposer(true)
     }
 
     //BEGIN Shortcuts
@@ -188,8 +188,8 @@ Controls2.ApplicationWindow {
                 kubeViews.push({item: logView, replace: true, immediate: true})
             }
 
-            function openComposer() {
-                kubeViews.push({item: composerView, immediate: true})
+            function openComposer(newMessage) {
+                kubeViews.push({item: composerView, immediate: true, properties: {newMessage: newMessage}})
             }
             function openComposerWithMail(mail, openAsDraft) {
                 kubeViews.push({item: composerView, immediate: true, properties: {message: mail, loadAsDraft: openAsDraft}})