diff --git a/examples/demo/src/app/layout.tsx b/examples/demo/src/app/layout.tsx
index c1a07075e4..95bfbf9fa2 100644
--- a/examples/demo/src/app/layout.tsx
+++ b/examples/demo/src/app/layout.tsx
@@ -1,4 +1,4 @@
-import { DemoFloatingWindow, StackProvider, StackTheme } from "@stackframe/stack";
+import { StackProvider, StackTheme } from "@stackframe/stack";
 import { Metadata } from "next";
 import React from "react";
 import Header from "src/components/header";
@@ -23,7 +23,6 @@ export default function RootLayout({
         <StackProvider app={stackServerApp}>
           <StackTheme>
             <Provider>
-              <DemoFloatingWindow />
               <div className="flex flex-col h-screen">
                 <Header />
                 <div className="flex flex-grow">
diff --git a/packages/init-stack/src/index.ts b/packages/init-stack/src/index.ts
index 631a4dc650..6cebe42a3f 100644
--- a/packages/init-stack/src/index.ts
+++ b/packages/init-stack/src/index.ts
@@ -734,7 +734,7 @@ async function getUpdatedLayout(originalLayout: string): Promise<LayoutResult |
   const importInsertLocationM1 =
     firstImportLocationM1 ?? (hasStringAsFirstLine ? layout.indexOf("\n") : -1);
   const importInsertLocation = importInsertLocationM1 + 1;
-  const importStatement = `import { StackProvider, StackTheme, DemoFloatingWindow } from "@stackframe/stack";\nimport { stackServerApp } from "../stack";\n`;
+  const importStatement = `import { StackProvider, StackTheme } from "@stackframe/stack";\nimport { stackServerApp } from "../stack";\n`;
   layout =
     layout.slice(0, importInsertLocation) +
     importStatement +
@@ -751,7 +751,17 @@ async function getUpdatedLayout(originalLayout: string): Promise<LayoutResult |
     return undefined;
   }
 
-  const insertOpen = "<StackProvider app={stackServerApp}><StackTheme><DemoFloatingWindow />";
+  const lines = layout.split("\n");
+  const [bodyOpenEndLine, bodyOpenEndIndexInLine] = getLineIndex(
+    lines,
+    bodyOpenEndIndex
+  );
+  const [bodyCloseStartLine, bodyCloseStartIndexInLine] = getLineIndex(
+    lines,
+    bodyCloseStartIndex
+  );
+
+  const insertOpen = "<StackProvider app={stackServerApp}><StackTheme>";
   const insertClose = "</StackTheme></StackProvider>";
 
   layout =
diff --git a/packages/template/src/components/demo-floating-window.tsx b/packages/template/src/components/demo-floating-window.tsx
deleted file mode 100644
index ca5d90ee27..0000000000
--- a/packages/template/src/components/demo-floating-window.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-"use client";
-
-import { Skeleton, Typography, buttonVariants, cn } from "@stackframe/stack-ui";
-import { GripHorizontal } from "lucide-react";
-import { Suspense, useEffect, useRef, useState } from "react";
-import { UserAvatar, useStackApp, useUser } from "..";
-import { Link } from "./link";
-
-type Position = {
-  x: number,
-  y: number,
-};
-
-function DemoFloatingWindowContent() {
-  const user = useUser();
-  const app = useStackApp();
-  const buttonClass = cn("w-full", buttonVariants({ variant: "outline" }));
-
-  return (
-    <div className="mt-4 flex flex-col gap-2">
-      {user ? (
-        <>
-          <div className="flex items-center gap-2 mb-2">
-            <UserAvatar />
-            <div className="flex flex-col">
-              <p className="text-sm font-medium">{user.displayName}</p>
-              <p className="text-xs text-muted-foreground">{user.primaryEmail}</p>
-            </div>
-          </div>
-
-          <Link
-            className={buttonClass}
-            href={app.urls.accountSettings}
-          >
-            Account Settings
-          </Link>
-          <Link
-            className={buttonClass}
-            href={app.urls.signOut}
-          >
-            Sign Out
-          </Link>
-        </>
-      ) : (
-        <>
-          <Link
-            className={buttonClass}
-            href={app.urls.signIn}
-          >
-            Sign In
-          </Link>
-          <Link
-            className={buttonClass}
-            href={app.urls.signUp}
-          >
-            Sign Up
-          </Link>
-        </>
-      )}
-    </div>
-  );
-}
-
-function DemoFloatingWindowSkeleton() {
-  return (
-    <div className="mt-4 flex flex-col gap-2">
-      <Skeleton className="h-9 w-full" />
-      <Skeleton className="h-9 w-full" />
-    </div>
-  );
-}
-
-export function DemoFloatingWindow() {
-  const [position, setPosition] = useState<Position>({ x: 20, y: 20 });
-  const [isDragging, setIsDragging] = useState(false);
-  const [dragOffset, setDragOffset] = useState<Position>({ x: 0, y: 0 });
-  const windowRef = useRef<HTMLDivElement>(null);
-
-  if (process.env.NODE_ENV !== "development") {
-    return null;
-  }
-
-  const handlePointerDown = (e: React.PointerEvent) => {
-    // Prevent text selection during drag
-    e.preventDefault();
-
-    if (windowRef.current) {
-      const rect = windowRef.current.getBoundingClientRect();
-      setDragOffset({
-        x: e.clientX - rect.left,
-        y: e.clientY - rect.top,
-      });
-      setIsDragging(true);
-    }
-  };
-
-  useEffect(() => {
-    const handlePointerMove = (e: PointerEvent) => {
-      if (isDragging) {
-        setPosition({
-          x: e.clientX - dragOffset.x,
-          y: e.clientY - dragOffset.y,
-        });
-      }
-    };
-
-    const handlePointerUp = () => {
-      setIsDragging(false);
-    };
-
-    if (isDragging) {
-      document.addEventListener("pointermove", handlePointerMove);
-      document.addEventListener("pointerup", handlePointerUp);
-      document.addEventListener("pointercancel", handlePointerUp);
-    }
-
-    return () => {
-      document.removeEventListener("pointermove", handlePointerMove);
-      document.removeEventListener("pointerup", handlePointerUp);
-      document.removeEventListener("pointercancel", handlePointerUp);
-    };
-  }, [isDragging, dragOffset]);
-
-  return (
-    <div
-      ref={windowRef}
-      className={cn(
-        "stack-scope fixed flex flex-col gap-3 p-5 rounded-lg shadow-lg bg-background/50 backdrop-blur-sm border border-border w-64",
-        isDragging && "cursor-grabbing"
-      )}
-      style={{
-        left: `${position.x}px`,
-        top: `${position.y}px`,
-        zIndex: 1000,
-      }}
-    >
-      <div
-        className="absolute top-0 left-0 right-0 h-6 bg-muted/70 rounded-t-lg cursor-grab flex items-center justify-center"
-        onPointerDown={handlePointerDown}
-        style={{ touchAction: "none" }}
-      >
-        <GripHorizontal className="w-4 h-4" />
-      </div>
-
-      <Suspense fallback={<DemoFloatingWindowSkeleton />}>
-        <DemoFloatingWindowContent />
-      </Suspense>
-
-      <div className="flex justify-center text-center">
-        <Typography type='footnote' variant='secondary'>
-          This is only visible in dev. Remove in layout.tsx.
-        </Typography>
-      </div>
-    </div>
-  );
-}
diff --git a/packages/template/src/index.ts b/packages/template/src/index.ts
index c977401943..32af4752bd 100644
--- a/packages/template/src/index.ts
+++ b/packages/template/src/index.ts
@@ -8,7 +8,6 @@ export { StackTheme } from './providers/theme-provider';
 
 export { AccountSettings } from "./components-page/account-settings";
 export { AuthPage } from "./components-page/auth-page";
-export { CliAuthConfirmation } from "./components-page/cli-auth-confirm";
 export { EmailVerification } from "./components-page/email-verification";
 export { ForgotPassword } from "./components-page/forgot-password";
 export { PasswordReset } from "./components-page/password-reset";
@@ -23,6 +22,5 @@ export { OAuthButton } from "./components/oauth-button";
 export { OAuthButtonGroup } from "./components/oauth-button-group";
 export { SelectedTeamSwitcher } from "./components/selected-team-switcher";
 export { UserButton } from "./components/user-button";
-
-export { DemoFloatingWindow } from "./components/demo-floating-window";
+export { CliAuthConfirmation } from "./components-page/cli-auth-confirm";
 // END_PLATFORM