2 files changed, 10 insertions, 2 deletions

diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 1a0847fa..6bddf5d8 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -66,6 +66,11 @@ Controls2.ApplicationWindow {
         onActivated: Qt.quit()
     }
     Shortcut {
+        onActivated: Kube.Fabric.postMessage(Kube.Messages.search, {})
+        sequence: StandardKey.Find
+
+    }
+    Shortcut {
         id: syncShortcut
         property variant folder: null
         sequence: StandardKey.Refresh
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 042196e4..6088e500 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -46,7 +46,8 @@ FocusScope {
     Kube.Listener {
         filter: Kube.Messages.search
         onMessageReceived: {
-            mailListModel.filter = message.filterString
+           filterField.visible = true
+           find.forceActiveFocus()
         }
     }
 
@@ -72,8 +73,8 @@ FocusScope {
             id: filterField
             Layout.fillWidth: true
             height: Kube.Units.gridUnit * 2
-
             color: Kube.Colors.buttonColor
+            visible: false
 
             RowLayout {
                 anchors {
@@ -92,9 +93,11 @@ FocusScope {
                 }
 
                 Kube.TextField {
+                    id: find
                     Layout.fillWidth: true
                     placeholderText: "Filter..."
                     onTextChanged: mailListModel.filter = text
+                    focus: true
                 }
             }
         }