diff --git a/extensions/github/src/pushErrorHandler.ts b/extensions/github/src/pushErrorHandler.ts
index 7f1eb7d0120..e03b285ec20 100644
--- a/extensions/github/src/pushErrorHandler.ts
+++ b/extensions/github/src/pushErrorHandler.ts
@@ -32,7 +32,9 @@ async function handlePushError(repository: Repository, remote: Remote, refspec:
 				}
 			} catch { }
 		} else {
-			// TODO@eamodio Figure out how to get the codespace id when on the desktop
+			// Call into the codespaces extension to get the codespace id
+			const info = await commands.executeCommand<{ name: string } | undefined>('github.codespaces.getCurrentCodespace');
+			codespace = info?.name;
 		}
 
 		if (!codespace) {