diff --git a/pkg/cmd/codespace/common.go b/pkg/cmd/codespace/common.go
index 7c4e61039..5e5bc7f64 100644
--- a/pkg/cmd/codespace/common.go
+++ b/pkg/cmd/codespace/common.go
@@ -158,7 +158,7 @@ func chooseCodespaceFromList(ctx context.Context, codespaces []*api.Codespace) (
 				codespacesNames[seenCodespace.idx] = fullDisplayNameWithGitStatus
 
 				// Update the git status dirty map to reflect the new name.
-				if cs.hasUnsavedChanges() {
+				if seenCodespace.cs.hasUnsavedChanges() {
 					codespacesDirty[fullDisplayNameWithGitStatus] = true
 				}