diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/AddAccountDialog.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/AddAccountDialog.kt
index bb6a574..bf4853a 100644
--- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/AddAccountDialog.kt
+++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/AddAccountDialog.kt
@@ -90,9 +90,7 @@ fun AddAccountDialog(
         showProgressIndicatorOnConfirmButton = isAddingAccount,
         useMoreThanPlatformDefaultWidthOnMobile = true,
         onDismiss = { dismiss() },
-        onConfirm = {
-            confirmCalled()
-        }
+        onConfirm = { confirmCalled() }
     ) {
         Column {
 
@@ -102,7 +100,9 @@ fun AddAccountDialog(
                 onEnteredTextChanged = { enteredBankSearchQuery = it },
                 onSelectedItemChanged = {
                     selectedBank = it
-                    loginNameFocus.requestFocus()
+                    if (it != null) {
+                        loginNameFocus.requestFocus()
+                    }
                 },
                 getItemTitle = { bank -> bank.name },
                 fetchSuggestions = { query -> bankingService.findBanks(query) }