diff --git a/CHANGELOG.md b/CHANGELOG.md
index b37cfe1..3db69cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 - action buttons on the token input step were swapped to achieve better keyboard navigation 
 
+### Fixed
+
+- authorization wizard automatically goes to a previous screen when an error is encountered during connection to Coder deployment 
+
 ## 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 a39288d..ad0a6de 100644
--- a/src/main/kotlin/com/coder/toolbox/views/AuthWizardPage.kt
+++ b/src/main/kotlin/com/coder/toolbox/views/AuthWizardPage.kt
@@ -22,7 +22,7 @@ class AuthWizardPage(
 
     private val signInStep = SignInStep(context)
     private val tokenStep = TokenStep(context)
-    private val connectStep = ConnectStep(context, shouldAutoLogin, this::notify, onConnect)
+    private val connectStep = ConnectStep(context, shouldAutoLogin, this::notify, this::displaySteps, onConnect)
 
 
     /**
diff --git a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
index ca77f30..30f757b 100644
--- a/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
+++ b/src/main/kotlin/com/coder/toolbox/views/ConnectStep.kt
@@ -27,6 +27,7 @@ class ConnectStep(
     private val context: CoderToolboxContext,
     private val shouldAutoLogin: StateFlow<Boolean>,
     private val notify: (String, Throwable) -> Unit,
+    private val refreshWizard: () -> Unit,
     private val onConnect: (
         client: CoderRestClient,
         cli: CoderCLIManager,
@@ -102,9 +103,13 @@ class ConnectStep(
             } catch (ex: CancellationException) {
                 if (ex.message != USER_HIT_THE_BACK_BUTTON) {
                     notify("Connection to ${url.host} was configured", ex)
+                    onBack()
+                    refreshWizard()
                 }
             } catch (ex: Exception) {
                 notify("Failed to configure ${url.host}", ex)
+                onBack()
+                refreshWizard()
             }
         }
     }