diff --git a/CHANGELOG.md b/CHANGELOG.md
index dde6c33..a9d2eff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Fixed
 
 - rendering glitches when a Workspace is stopped while SSH connection is alive
+- misleading message saying that there are no workspaces rendered during manual authentication
 
 ## 0.2.0 - 2025-04-24
 
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
index 4ccce7e..2cdbaf9 100644
--- a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
+++ b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -262,6 +262,7 @@ class CoderRemoteProvider(
             // start initialization with the new settings
             this@CoderRemoteProvider.client = restClient
             coderHeaderPage = NewEnvironmentPage(context, context.i18n.pnotr(restClient.url.toString()))
+            environments.showLoadingMessage()
             pollJob = poll(restClient, cli)
         }
     }
@@ -326,7 +327,14 @@ class CoderRemoteProvider(
         context.secrets.rememberMe = true
         this.client = client
         pollJob?.cancel()
+        environments.showLoadingMessage()
         pollJob = poll(client, cli)
         goToEnvironmentsPage()
     }
+
+    private fun MutableStateFlow<LoadableState<List<RemoteProviderEnvironment>>>.showLoadingMessage() {
+        this.update {
+            LoadableState.Loading
+        }
+    }
 }