diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce7ecd5..be5a605 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- action buttons on the token input step were swapped to achieve better keyboard navigation 
+
 ## 0.1.3 - 2025-04-09
 
 ### Fixed
diff --git a/src/main/kotlin/com/coder/toolbox/views/AuthWizardPage.kt b/src/main/kotlin/com/coder/toolbox/views/AuthWizardPage.kt
index c423bfe..a39288d 100644
--- a/src/main/kotlin/com/coder/toolbox/views/AuthWizardPage.kt
+++ b/src/main/kotlin/com/coder/toolbox/views/AuthWizardPage.kt
@@ -59,14 +59,14 @@ class AuthWizardPage(
                 }
                 actionButtons.update {
                     listOf(
-                        Action(context.i18n.ptrl("Back"), closesPage = false, actionBlock = {
-                            tokenStep.onBack()
-                            displaySteps()
-                        }),
                         Action(context.i18n.ptrl("Connect"), closesPage = false, actionBlock = {
                             if (tokenStep.onNext()) {
                                 displaySteps()
                             }
+                        }),
+                        Action(context.i18n.ptrl("Back"), closesPage = false, actionBlock = {
+                            tokenStep.onBack()
+                            displaySteps()
                         })
                     )
                 }