2 files changed, 3 insertions, 3 deletions

diff --git a/views/composer/qml/AddresseeListEditor.qml b/views/composer/qml/AddresseeListEditor.qml
index 2110e3d9..30571d8b 100644
--- a/views/composer/qml/AddresseeListEditor.qml
+++ b/views/composer/qml/AddresseeListEditor.qml
@@ -127,12 +127,12 @@ FocusScope {
                     root.controller.add({name: text});
                     clear()
                     visible = false
-                    button.forceActiveFocus()
+                    button.forceActiveFocus(Qt.TabFocusReason)
                 }
                 onAborted: {
                     clear()
                     visible = false
-                    button.forceActiveFocus()
+                    button.forceActiveFocus(Qt.TabFocusReason)
                 }
             }
         }
diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml
index e7f7a6d1..f980bfd6 100644
--- a/views/composer/qml/View.qml
+++ b/views/composer/qml/View.qml
@@ -382,7 +382,7 @@ Kube.View {
                 }
 
                 onActiveFocusChanged: closeFirstSplitIfNecessary()
-                Keys.onEscapePressed: recipients.forceActiveFocus()
+                Keys.onEscapePressed: recipients.forceActiveFocus(Qt.TabFocusReason)
                 onTextChanged: {
                     composerController.body = text;
                 }