diff --git a/apps/web/src/app/(onboarding)/setup/StepSourceControlConfig.client.test.tsx b/apps/web/src/app/(onboarding)/setup/StepSourceControlConfig.client.test.tsx
index b27d89b94..197ed3e0c 100644
--- a/apps/web/src/app/(onboarding)/setup/StepSourceControlConfig.client.test.tsx
+++ b/apps/web/src/app/(onboarding)/setup/StepSourceControlConfig.client.test.tsx
@@ -184,6 +184,22 @@ describe('StepSourceControlConfig', () => {
     expect(screen.queryByText('GitHub App ID')).not.toBeInTheDocument();
   });
 
+  it('shows Back on the GitHub create screen when a previous step exists', () => {
+    const onBack = vi.fn();
+
+    render(
+      <StepSourceControlConfig
+        sourceControlSetup={buildSourceControlSetup()}
+        selectedProviderId="github"
+        onContinue={vi.fn()}
+        onBack={onBack}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /^Back$/i }));
+    expect(onBack).toHaveBeenCalledOnce();
+  });
+
   it('creates the app on the personal account when no organization is entered', () => {
     render(
       <StepSourceControlConfig
diff --git a/apps/web/src/app/(onboarding)/setup/hooks.ts b/apps/web/src/app/(onboarding)/setup/hooks.ts
index 0a48f8664..225b24acc 100644
--- a/apps/web/src/app/(onboarding)/setup/hooks.ts
+++ b/apps/web/src/app/(onboarding)/setup/hooks.ts
@@ -534,7 +534,8 @@ export function useSetupFlow(
       return (
         navigationHistoryRef.current.at(-1) ??
         findPreviousStep(SETUP_STEPS.indexOf(currentStep)) ??
-        (currentStep === 'source-control-connect'
+        (currentStep === 'source-control-connect' ||
+        currentStep === 'source-control-config'
           ? 'source-control-provider'
           : null)
       );
diff --git a/apps/web/src/app/(onboarding)/setup/page.tsx b/apps/web/src/app/(onboarding)/setup/page.tsx
index ddb42835c..de21ae54e 100644
--- a/apps/web/src/app/(onboarding)/setup/page.tsx
+++ b/apps/web/src/app/(onboarding)/setup/page.tsx
@@ -657,14 +657,15 @@ export default function SetupPage() {
                 setPendingSourceControlProvider(null);
                 goToStep('source-control-connect');
               }}
-              onBack={
-                canGoBack
-                  ? () => {
-                      setPendingSourceControlProvider(null);
-                      goToPreviousStep();
-                    }
-                  : undefined
-              }
+              onBack={() => {
+                setPendingSourceControlProvider(null);
+                if (canGoBack) {
+                  goToPreviousStep();
+                  return;
+                }
+
+                goToStep('source-control-provider');
+              }}
             />
           )}
           {step === 'source-control-connect' && (