diff --git a/apps/web/src/app/(app)/layout.tsx b/apps/web/src/app/(app)/layout.tsx
index eac1d1ad50..aae2e8bdac 100644
--- a/apps/web/src/app/(app)/layout.tsx
+++ b/apps/web/src/app/(app)/layout.tsx
@@ -9,6 +9,7 @@ import { AdminOmnibox } from '@/components/admin-omnibox';
 import { AppShellSkipLink } from '@/components/AppShellSkipLink';
 import { PrefetchedOrganizations } from './components/PrefetchedOrganizations';
 import { PlatformPresenceMount } from './components/PlatformPresenceMount';
+import { CustomerSourceSurvey } from '@/components/CustomerSourceSurvey';
 export default function AppLayout({ children }: { children: React.ReactNode }) {
   return (
     <RoleTestingProvider>
@@ -31,6 +32,7 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
               </div>
             </PrefetchedOrganizations>
           </SidebarProvider>
+          <CustomerSourceSurvey />
         </EventServiceProvider>
       </PageTitleProvider>
       <AdminOmnibox />
diff --git a/apps/web/src/app/customer-source-survey/page.tsx b/apps/web/src/app/customer-source-survey/page.tsx
index 020280eab0..1223f94b05 100644
--- a/apps/web/src/app/customer-source-survey/page.tsx
+++ b/apps/web/src/app/customer-source-survey/page.tsx
@@ -1,28 +1,16 @@
 import { redirect } from 'next/navigation';
 import { getUserFromAuthOrRedirect } from '@/lib/user/server';
-import { KiloCardLayout } from '@/components/KiloCardLayout';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
-import { CustomerSourceSurvey } from '@/components/CustomerSourceSurvey';
 
 export default async function CustomerSourceSurveyPage({ searchParams }: AppPageProps) {
-  const user = await getUserFromAuthOrRedirect('/users/sign_in');
+  await getUserFromAuthOrRedirect('/users/sign_in');
   const params = await searchParams;
 
-  // Determine where to go after survey
   const callbackParam = params.callbackPath;
   const redirectPath =
     callbackParam && typeof callbackParam === 'string' && isValidCallbackPath(callbackParam)
       ? callbackParam
       : '/get-started';
 
-  // If already answered, skip past
-  if (user.customer_source !== null) {
-    redirect(redirectPath);
-  }
-
-  return (
-    <KiloCardLayout title="Where did you hear about Kilo Code?" className="max-w-2xl">
-      <CustomerSourceSurvey redirectPath={redirectPath} />
-    </KiloCardLayout>
-  );
+  redirect(redirectPath);
 }
diff --git a/apps/web/src/components/CustomerSourceSurvey.tsx b/apps/web/src/components/CustomerSourceSurvey.tsx
index ba3c49ecb4..f9c9b66b56 100644
--- a/apps/web/src/components/CustomerSourceSurvey.tsx
+++ b/apps/web/src/components/CustomerSourceSurvey.tsx
@@ -1,72 +1,72 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter } from 'next/navigation';
 import { useMutation } from '@tanstack/react-query';
 import { useTRPC } from '@/lib/trpc/utils';
+import { useUser } from '@/hooks/useUser';
 import { Button } from '@/components/ui/button';
-import { Textarea } from '@/components/ui/textarea';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
 
-type CustomerSourceSurveyProps = {
-  redirectPath: string;
-};
-
-export function CustomerSourceSurvey({ redirectPath }: CustomerSourceSurveyProps) {
+export function CustomerSourceSurvey() {
   const [source, setSource] = useState('');
-  const [skipped, setSkipped] = useState(false);
-  const router = useRouter();
+  const [dismissed, setDismissed] = useState(false);
+  const { data: user } = useUser();
   const trpc = useTRPC();
 
-  const { mutate: submitSource, isPending } = useMutation(
+  const submitSource = useMutation(
     trpc.user.submitCustomerSource.mutationOptions({
-      onSuccess: () => {
-        router.push(redirectPath);
-      },
+      onSuccess: () => setDismissed(true),
     })
   );
 
-  const { mutate: skipSource } = useMutation(
+  const skipSource = useMutation(
     trpc.user.skipCustomerSource.mutationOptions({
-      onSuccess: () => {
-        router.push(redirectPath);
-      },
-      onError: () => {
-        setSkipped(false);
-      },
+      onSuccess: () => setDismissed(true),
     })
   );
 
-  function handleSkip() {
-    setSkipped(true);
-    skipSource();
+  if (dismissed || user?.customer_source !== null) {
+    return null;
   }
 
   return (
-    <div className="space-y-4 px-6 pb-6">
-      <Textarea
-        autoFocus
-        placeholder="Example: A YouTube video from Theo"
-        value={source}
-        onChange={e => setSource(e.target.value)}
-        rows={3}
-        maxLength={1000}
-      />
-      <div className="flex items-center justify-between">
-        <button
-          type="button"
-          onClick={handleSkip}
-          disabled={skipped || isPending}
-          className="cursor-pointer text-muted-foreground text-sm hover:underline"
-        >
-          {skipped ? 'Skipping...' : 'Skip'}
-        </button>
-        <Button
-          onClick={() => submitSource({ source: source.trim() })}
-          disabled={isPending || skipped || source.trim().length === 0}
-        >
-          {isPending ? 'Submitting...' : 'Submit'}
-        </Button>
-      </div>
-    </div>
+    <aside className="fixed right-4 bottom-20 z-40 w-[calc(100vw-2rem)] max-w-sm">
+      <Card className="shadow-lg">
+        <CardHeader className="p-4 pb-3">
+          <CardTitle>Where did you hear about Kilo Code?</CardTitle>
+          <CardDescription>A short answer helps us understand what is working.</CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-3 p-4 pt-0">
+          <div className="space-y-1.5">
+            <Label htmlFor="customer-source">Source</Label>
+            <Input
+              id="customer-source"
+              placeholder="GitHub, a teammate, YouTube..."
+              value={source}
+              onChange={event => setSource(event.target.value)}
+              maxLength={1000}
+            />
+          </div>
+          <div className="flex items-center justify-between gap-2">
+            <Button
+              type="button"
+              variant="ghost"
+              onClick={() => skipSource.mutate()}
+              disabled={skipSource.isPending || submitSource.isPending}
+            >
+              Dismiss
+            </Button>
+            <Button
+              onClick={() => submitSource.mutate({ source: source.trim() })}
+              disabled={submitSource.isPending || skipSource.isPending || !source.trim()}
+            >
+              Save answer
+            </Button>
+          </div>
+        </CardContent>
+      </Card>
+    </aside>
   );
 }
diff --git a/apps/web/src/lib/survey-redirect.ts b/apps/web/src/lib/survey-redirect.ts
index 1c07f4167b..1862898eea 100644
--- a/apps/web/src/lib/survey-redirect.ts
+++ b/apps/web/src/lib/survey-redirect.ts
@@ -1,16 +1,12 @@
 import type { User } from '@kilocode/db/schema';
 
 /**
- * If the user has not yet completed the customer-source survey,
- * wraps `destinationPath` so the user lands on the survey first,
- * then continues to `destinationPath` after completing it.
+ * Preserves the existing call sites while the customer-source question is
+ * presented non-blockingly in the authenticated app shell.
  */
 export function maybeInterceptWithSurvey(
-  user: Pick<User, 'customer_source'>,
+  _user: Pick<User, 'customer_source'>,
   destinationPath: string
 ): string {
-  if (user.customer_source === null && !destinationPath.startsWith('/customer-source-survey')) {
-    return `/customer-source-survey?callbackPath=${encodeURIComponent(destinationPath)}`;
-  }
   return destinationPath;
 }
diff --git a/apps/web/src/tests/account-verification-redirect.test.ts b/apps/web/src/tests/account-verification-redirect.test.ts
index 47e1714eb7..72466fa3b9 100644
--- a/apps/web/src/tests/account-verification-redirect.test.ts
+++ b/apps/web/src/tests/account-verification-redirect.test.ts
@@ -6,7 +6,7 @@
  *   redirect directly to the final destination (callbackPath or /get-started),
  *   skipping the survey entirely.
  * - If stytchStatus !== null AND user.customer_source === null:
- *   redirect to /customer-source-survey with callbackPath forwarding.
+ *   redirect directly to the final destination without blocking on the survey.
  * - If stytchStatus === null: render the page (no redirect).
  */
 
@@ -163,7 +163,7 @@ describe('account-verification redirect logic', () => {
   // Case: verified user who has NOT completed the survey
   // ---------------------------------------------------------------
   describe('when stytchStatus is non-null AND customer_source is null (survey not completed)', () => {
-    it('should redirect to /customer-source-survey with /get-started as default destination', async () => {
+    it('should redirect to /get-started as the default destination', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -171,12 +171,10 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect to /customer-source-survey with callbackPath forwarded', async () => {
+    it('should redirect directly to callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -184,12 +182,10 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/get-started' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect to /customer-source-survey with an org callbackPath forwarded', async () => {
+    it('should redirect directly to an org callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -197,9 +193,7 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/organizations/some-org-id' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/organizations/some-org-id');
     });
   });
 
@@ -277,9 +271,7 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
     it('should skip survey when customer_source is set even with stytchStatus=false', async () => {
@@ -556,10 +548,7 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: 'https://evil.com/phish' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      // Invalid callbackPath is dropped — redirect to survey with default destination
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
     it('should ignore invalid callbackPath for user with customer_source set', async () => {
diff --git a/apps/web/src/tests/survey-redirect.test.ts b/apps/web/src/tests/survey-redirect.test.ts
deleted file mode 100644
index 9d319688ec..0000000000
--- a/apps/web/src/tests/survey-redirect.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
-
-describe('maybeInterceptWithSurvey', () => {
-  it('wraps destination with survey when customer_source is null', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-    );
-  });
-
-  it('preserves complex callback paths', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/organizations/some-org-id')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
-    );
-  });
-
-  it('returns destination unchanged when customer_source is a non-empty string', () => {
-    const user = { customer_source: 'Twitter' };
-    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe('/get-started');
-  });
-
-  it('returns destination unchanged when customer_source is empty string (skipped)', () => {
-    const user = { customer_source: '' };
-    expect(maybeInterceptWithSurvey(user, '/profile')).toBe('/profile');
-  });
-
-  it('does not double-wrap if destination is already the survey page', () => {
-    const user = { customer_source: null };
-    const surveyPath = '/customer-source-survey?callbackPath=%2Fget-started';
-    expect(maybeInterceptWithSurvey(user, surveyPath)).toBe(surveyPath);
-  });
-
-  it('does not double-wrap bare survey path', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/customer-source-survey')).toBe(
-      '/customer-source-survey'
-    );
-  });
-
-  it('correctly encodes destinations containing query strings', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/organizations/abc?tab=billing')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/abc?tab=billing')}`
-    );
-  });
-});
diff --git a/apps/web/tests/e2e/customer-source-survey.spec.ts b/apps/web/tests/e2e/customer-source-survey.spec.ts
deleted file mode 100644
index 5e17870cb6..0000000000
--- a/apps/web/tests/e2e/customer-source-survey.spec.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { test, expect } from '@chromatic-com/playwright';
-import { randomUUID } from 'crypto';
-
-/**
- * Customer Source Survey E2E tests.
- *
- * Each test that needs a clean survey state (customer_source === null) creates
- * its own fresh user via the fake-login flow. This avoids shared-state issues
- * where one test's actions (submit/skip) poison subsequent tests.
- *
- * The helper `signInFreshUser` navigates through sign-in and stytch verification
- * with a brand-new email, landing the user at wherever the post-verification
- * redirect points (which should be /customer-source-survey once Task 6 is done).
- */
-
-function isSignedInDestination(url: URL) {
-  return url.pathname === '/profile' || url.pathname.startsWith('/organizations/');
-}
-
-async function waitForSignedInDestination(page: import('@playwright/test').Page) {
-  await page.waitForURL(url => isSignedInDestination(url), {
-    timeout: 15000,
-  });
-  expect(isSignedInDestination(new URL(page.url()))).toBe(true);
-}
-
-/**
- * Signs in a brand-new user via fake-login with stytchpass behavior.
- * Returns the final URL after sign-in + verification completes.
- *
- * Uses +stytchpass to auto-pass stytch verification so the user proceeds
- * through the full new-user flow: sign-in -> after-sign-in -> account-verification -> survey.
- */
-async function signInFreshUser(page: import('@playwright/test').Page): Promise<string> {
-  const uniqueId = randomUUID().slice(0, 8);
-  const testEmail = `test-survey-${uniqueId}+stytchpass@example.com`;
-
-  await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
-
-  // Wait for the full redirect chain to settle.
-  await page.waitForURL(
-    url => url.pathname === '/customer-source-survey' || isSignedInDestination(url),
-    { timeout: 30000, waitUntil: 'networkidle' }
-  );
-
-  return page.url();
-}
-
-test.describe('Customer Source Survey', () => {
-  // These tests do NOT use the shared storageState from auth.setup.ts.
-  // Each test creates its own user to ensure isolation.
-  test.use({ storageState: { cookies: [], origins: [] } });
-
-  test('new user is redirected to survey after verification', async ({ page }) => {
-    const finalUrl = await signInFreshUser(page);
-
-    // After Task 6 (account-verification redirect change), new users should
-    // land on /customer-source-survey instead of continuing directly to their app destination.
-    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
-  });
-
-  test('survey page displays expected content', async ({ page }) => {
-    const finalUrl = await signInFreshUser(page);
-    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
-
-    // Verify the page has the expected heading
-    await expect(page.getByText('Where did you hear about Kilo Code?')).toBeVisible();
-
-    // Verify the textarea placeholder is present
-    await expect(page.getByPlaceholder('Example: A YouTube video from Theo')).toBeVisible();
-
-    // Verify Submit button exists and is initially disabled (empty input)
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-    await expect(submitButton).toBeVisible();
-    await expect(submitButton).toBeDisabled();
-
-    // Verify Skip link exists
-    await expect(page.getByRole('button', { name: 'Skip' })).toBeVisible();
-  });
-
-  test('submit button is enabled only when textarea has content', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    // Initially disabled
-    await expect(submitButton).toBeDisabled();
-
-    // Type something
-    await textarea.fill('A friend told me');
-    await expect(submitButton).toBeEnabled();
-
-    // Clear it
-    await textarea.fill('');
-    await expect(submitButton).toBeDisabled();
-
-    // Whitespace only should not enable (trim check)
-    await textarea.fill('   ');
-    await expect(submitButton).toBeDisabled();
-  });
-
-  test('submitting a response redirects to the signed-in app destination', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Found it on Reddit');
-    await submitButton.click();
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('skipping redirects to the signed-in app destination', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('already-answered user is redirected past survey', async ({ page }) => {
-    // First: sign in and submit a response
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Twitter post');
-    await submitButton.click();
-
-    await waitForSignedInDestination(page);
-
-    // Now navigate directly to the survey page. Since customer_source is set,
-    // the server component should redirect past it.
-    await page.goto('/customer-source-survey');
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('after skipping, revisiting survey should redirect away (H2 sentinel)', async ({ page }) => {
-    // This test verifies the H2 bug fix: when a user clicks "Skip", a sentinel
-    // value should be written to customer_source so that revisiting the survey
-    // redirects past it. Without the fix, customer_source stays null and the
-    // survey is shown again.
-    await signInFreshUser(page);
-
-    // Click Skip
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    await waitForSignedInDestination(page);
-
-    // Navigate back to the survey page directly
-    await page.goto('/customer-source-survey');
-
-    // If H2 is fixed (skip writes a sentinel), user should be redirected away.
-    // If H2 is NOT fixed, user will see the survey form again.
-    await page.waitForURL(
-      url => isSignedInDestination(url) || url.pathname === '/customer-source-survey',
-      { timeout: 15000 }
-    );
-
-    // This assertion will FAIL until the H2 skip-persistence bug is fixed
-    expect(isSignedInDestination(new URL(page.url()))).toBe(true);
-  });
-
-  test('survey preserves callbackPath through submit', async ({ page }) => {
-    await signInFreshUser(page);
-
-    // If the user landed on /customer-source-survey, navigate with a callbackPath
-    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Hacker News');
-    await submitButton.click();
-
-    // Should redirect to /profile (the callbackPath), not the default destination
-    await page.waitForURL(url => url.pathname === '/profile', {
-      timeout: 15000,
-    });
-    expect(new URL(page.url()).pathname).toBe('/profile');
-  });
-
-  test('survey preserves callbackPath through skip', async ({ page }) => {
-    await signInFreshUser(page);
-
-    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
-
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    // Should redirect to /profile (the callbackPath), not the default destination
-    await page.waitForURL(url => url.pathname === '/profile', {
-      timeout: 15000,
-    });
-    expect(new URL(page.url()).pathname).toBe('/profile');
-  });
-});