From 0d82f835aaa26dae2fc29f55a439c3c2e6849c54 Mon Sep 17 00:00:00 2001
From: dmotte <37443982+dmotte@users.noreply.github.com>
Date: Thu, 21 May 2026 21:46:04 +0200
Subject: [PATCH] Improve credentials input focus logic

---
 app/ui.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/ui.js b/app/ui.js
index 24d32d55..72448a5e 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1289,12 +1289,15 @@ const UI = {
         if (e.detail.types.indexOf("username") === -1) {
             document.getElementById("noVNC_username_block").classList.add("noVNC_hidden");
         } else {
-            inputFocus = inputFocus === "none" ? "noVNC_username_input" : inputFocus;
+            inputFocus = inputFocus === "none" &&
+                document.getElementById("noVNC_username_input").value === ""
+                ? "noVNC_username_input" : inputFocus;
         }
         if (e.detail.types.indexOf("password") === -1) {
             document.getElementById("noVNC_password_block").classList.add("noVNC_hidden");
         } else {
-            inputFocus = inputFocus === "none" ? "noVNC_password_input" : inputFocus;
+            inputFocus = inputFocus === "none"
+                ? "noVNC_password_input" : inputFocus;
         }
         document.getElementById('noVNC_credentials_dlg')
             .classList.add('noVNC_open');