1 files changed, 8 insertions, 1 deletions

diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index a0921a6e..eff3f921 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.1
 
 import org.kube.framework 1.0 as Kube
 
-Item {
+FocusScope {
     id: root
     //Private properties
     property variant parentFolder: null
@@ -68,12 +68,19 @@ Item {
 
         anchors.fill: parent
         clip: true
+        focus: true
 
         ScrollBar.vertical: ScrollBar{
             id: scrollbar
         }
 
         //BEGIN keyboard nav
+        onActiveFocusChanged: {
+            if (activeFocus && currentIndex < 0) {
+                currentIndex = 0
+            }
+        }
+
         Keys.onDownPressed: {
             incrementCurrentIndex()
         }