2 files changed, 9 insertions, 0 deletions

diff --git a/components/kube/qml/ComposerView.qml b/components/kube/qml/ComposerView.qml
index 2e0267d5..9119de27 100644
--- a/components/kube/qml/ComposerView.qml
+++ b/components/kube/qml/ComposerView.qml
@@ -106,6 +106,7 @@ Kube.View {
             spacing: Kube.Units.largeSpacing
 
             Kube.PositiveButton {
+                objectName: "newMailButton"
                 anchors {
                     left: parent.left
                     right: parent.right
diff --git a/components/kube/tests/tst_composerview.qml b/components/kube/tests/tst_composerview.qml
index 81ad5eaa..52475721 100644
--- a/components/kube/tests/tst_composerview.qml
+++ b/components/kube/tests/tst_composerview.qml
@@ -26,12 +26,20 @@ TestCase {
     width: 400
     height: 400
     name: "ComposerView"
+    when: windowShown
 
     ComposerView {
         id: composer
+        focus: true
     }
 
     function test_start() {
         verify(composer)
     }
+
+    function test_verifyInitialFocus() {
+        var newMailButton = findChild(composer, "newMailButton");
+        verify(newMailButton)
+        verify(newMailButton.activeFocus)
+    }
 }