From eaede7d62d076a339c16cb7f28570e23d6775036 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@kiteworks.com>
Date: Tue, 15 Oct 2024 15:56:29 +0200
Subject: [PATCH] Fix tab order in basic auth login screen

Fixes: #11912
---
 src/gui/qml/credentials/BasicAuthCredentials.qml | 2 ++
 src/gui/qml/credentials/Credentials.qml          | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gui/qml/credentials/BasicAuthCredentials.qml b/src/gui/qml/credentials/BasicAuthCredentials.qml
index 4c07293b32b..1bd2a36f768 100644
--- a/src/gui/qml/credentials/BasicAuthCredentials.qml
+++ b/src/gui/qml/credentials/BasicAuthCredentials.qml
@@ -65,6 +65,8 @@ Credentials {
             if (!credentials.isRefresh) {
                 widget.parentFocusWidget.focusNext();
                 event.accepted = true;
+            } else {
+                event.accepted = false;
             }
         }
     }
diff --git a/src/gui/qml/credentials/Credentials.qml b/src/gui/qml/credentials/Credentials.qml
index dd040e7fd5b..39397f1ffde 100644
--- a/src/gui/qml/credentials/Credentials.qml
+++ b/src/gui/qml/credentials/Credentials.qml
@@ -44,8 +44,12 @@ Pane {
             text: qsTr("Stay logged out")
             onClicked: credentials.logOutRequested()
 
-            Keys.onTabPressed: {
-                widget.parentFocusWidget.focusNext();
+            Keys.onTabPressed: event => {
+                if (credentials.isRefresh) {
+                    event.accepted = false;
+                } else {
+                    widget.parentFocusWidget.focusNext();
+                }
             }
 
             Component.onCompleted: {