diff --git a/apps/web/package.json b/apps/web/package.json
index 9bd16e2..7f55925 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -69,7 +69,6 @@
     "react-dom": "~19.1.1",
     "react-hook-form": "~7.57.0",
     "react-virtuoso": "~4.13.0",
-    "react-window": "^2.1.1",
     "remark-gfm": "~4.0.1",
     "remove-markdown": "~0.6.2",
     "sonner": "~2.0.7",
diff --git a/apps/web/src/ai/tools/create-page.client.ts b/apps/web/src/ai/tools/create-page.client.ts
index 5e497f3..aeb2c63 100644
--- a/apps/web/src/ai/tools/create-page.client.ts
+++ b/apps/web/src/ai/tools/create-page.client.ts
@@ -1,8 +1,8 @@
 "use client";
 
-import type { Page } from "@acme/db/schema";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useRouter } from "next/navigation";
+import { infinitePagesQueryOptions } from "~/app/api/trpc/options/pages-query-options";
 import { useTRPC } from "~/trpc/react";
 import { useAppEventEmitter } from "../../components/events/app-event-context";
 import { PageCreatedEvent } from "../../events/page-created-event";
@@ -35,11 +35,34 @@ export function useCreatePageTool() {
             });
           },
           onSuccess: (newPage) => {
+            // Optimistically update the pages list
             queryClient.setQueryData(
-              trpc.pages.getByUser.queryOptions().queryKey,
-              (oldPages: Page[] | undefined) => {
-                if (!oldPages) return [newPage];
-                return [newPage, ...oldPages];
+              trpc.pages.getPaginated.infiniteQueryOptions(
+                infinitePagesQueryOptions,
+              ).queryKey,
+              (old) => {
+                if (!old)
+                  return {
+                    pageParams: [],
+                    pages: [
+                      {
+                        items: [newPage],
+                        nextCursor: undefined,
+                      },
+                    ],
+                  };
+                const [first, ...rest] = old.pages;
+                return {
+                  ...old,
+                  pages: [
+                    {
+                      ...first,
+                      items: [newPage, ...(first?.items ?? [])],
+                      nextCursor: first?.nextCursor,
+                    },
+                    ...rest,
+                  ],
+                };
               },
             );
 
diff --git a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item-skeleton.tsx b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item-skeleton.tsx
new file mode 100644
index 0000000..b6fc870
--- /dev/null
+++ b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item-skeleton.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import {
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+} from "~/components/ui/sidebar";
+import { Skeleton } from "~/components/ui/skeleton";
+
+type AppSidebarPageItemSkeletonProps = {
+  className?: string;
+};
+
+export function AppSidebarPageItemSkeleton({
+  className,
+}: AppSidebarPageItemSkeletonProps) {
+  return (
+    <SidebarMenuSubItem className={className}>
+      <SidebarMenuSubButton asChild>
+        <div
+          className={
+            "group/page-item flex items-center justify-between p-0! hover:bg-transparent"
+          }
+        >
+          <Skeleton className="h-5 w-full rounded-sm" />
+        </div>
+      </SidebarMenuSubButton>
+    </SidebarMenuSubItem>
+  );
+}
diff --git a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item.tsx b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item.tsx
index 7feae4e..faa1cf8 100644
--- a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item.tsx
+++ b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-page-item.tsx
@@ -12,17 +12,19 @@ import { DeletePageButton } from "./delete-page-button";
 
 type AppSidebarPageItemProps = {
   page: Page;
+  className?: string;
 };
 
-export function AppSidebarPageItem(props: AppSidebarPageItemProps) {
-  const { page } = props;
-
+export function AppSidebarPageItem({
+  page,
+  className,
+}: AppSidebarPageItemProps) {
   const pathname = usePathname();
 
   const isActive = pathname.includes(page?.id ?? "");
 
   return (
-    <SidebarMenuSubItem key={page?.id}>
+    <SidebarMenuSubItem key={page?.id} className={className}>
       <SidebarMenuSubButton asChild>
         <div
           className={cn(
diff --git a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx
index 68a01de..5a70226 100644
--- a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx
+++ b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx
@@ -1,10 +1,10 @@
 "use client";
 
-import type { Page } from "@acme/db/schema";
+import type { PaginatedPagesInput } from "@acme/api";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { BookOpen, ChevronRight, Loader2 } from "lucide-react";
 import { useState } from "react";
-import { List } from "react-window";
+import { Virtuoso } from "react-virtuoso";
 import {
   Collapsible,
   CollapsibleContent,
@@ -17,32 +17,32 @@ import {
 } from "~/components/ui/sidebar";
 import { useTRPC } from "~/trpc/react";
 import { AppSidebarPageItem } from "./app-sidebar-page-item";
+import { AppSidebarPageItemSkeleton } from "./app-sidebar-page-item-skeleton";
 import { CreatePageButton } from "./create-page-button";
 
 type AppSidebarPagesProps = {
-  infinitePagesQueryOptions: {
-    direction: "forward" | "backward";
-    limit: number;
-  };
+  infinitePagesQueryOptions: PaginatedPagesInput;
   defaultOpen?: boolean;
 };
 
+const APPROXIMATE_ITEM_HEIGHT = 28;
+const VIEWPORT_INCREASE_FACTOR = 5;
+
 export const AppSidebarPages = ({
   infinitePagesQueryOptions,
   defaultOpen = true,
 }: AppSidebarPagesProps) => {
   const trpc = useTRPC();
   const { state, setOpen } = useSidebar();
-  const queryOptions = trpc.pages.getInfinite.infiniteQueryOptions(
+  const queryOptions = trpc.pages.getPaginated.infiniteQueryOptions(
     infinitePagesQueryOptions,
   );
-  const { data, fetchNextPage, isFetchingNextPage, hasNextPage } =
-    useInfiniteQuery({
-      ...queryOptions,
-      getNextPageParam: ({ nextCursor }) => {
-        return nextCursor;
-      },
-    });
+  const { status, data, fetchNextPage, hasNextPage } = useInfiniteQuery({
+    ...queryOptions,
+    getNextPageParam: ({ nextCursor }) => {
+      return nextCursor;
+    },
+  });
 
   const pages = data?.pages?.flatMap((page) => page.items) ?? [];
 
@@ -72,7 +72,7 @@ export const AppSidebarPages = ({
           tooltip="Pages"
           onClick={handlePagesClick}
         >
-          {isFetchingNextPage ? (
+          {status === "pending" ? (
             <Loader2 className="size-3 animate-spin" />
           ) : (
             <BookOpen />
@@ -82,47 +82,35 @@ export const AppSidebarPages = ({
         </SidebarMenuButton>
       </CollapsibleTrigger>
 
-      <CollapsibleContent className="flex min-h-0 flex-col">
-        <SidebarMenuSub className="mr-0 flex-1 overflow-scroll pr-0">
-          <CreatePageButton />
-          <List
-            rowComponent={PageRow}
-            rowCount={pages.length}
-            rowHeight={28}
-            // @ts-expect-error - react-window types are incorrectly expecting index/style in rowProps
-            rowProps={{
-              pages,
-            }}
-            onRowsRendered={({ stopIndex }) => {
-              // Fetch next page when user scrolls near the end
-              if (
-                stopIndex >= pages.length - 5 &&
-                !isFetchingNextPage &&
-                hasNextPage
-              ) {
+      <CollapsibleContent className="flex h-full min-h-0 flex-col">
+        <SidebarMenuSub className="mx-0 mr-0 flex-1 gap-0 overflow-scroll border-none px-0">
+          <CreatePageButton className="ml-3.5 border-sidebar-border border-l ps-2.5 pb-2" />
+          <Virtuoso
+            className="h-full w-full"
+            data={pages}
+            increaseViewportBy={
+              APPROXIMATE_ITEM_HEIGHT * VIEWPORT_INCREASE_FACTOR
+            }
+            itemContent={(_, page) => (
+              <AppSidebarPageItem
+                page={page}
+                className="ml-3.5 border-sidebar-border border-l ps-2.5 pb-1"
+              />
+            )}
+            endReached={() => {
+              if (status === "success" && hasNextPage) {
                 fetchNextPage();
               }
             }}
+            components={{
+              Footer: () =>
+                status === "pending" ? (
+                  <AppSidebarPageItemSkeleton className="ml-3.5 border-sidebar-border border-l ps-2.5" />
+                ) : null,
+            }}
           />
         </SidebarMenuSub>
       </CollapsibleContent>
     </Collapsible>
   );
 };
-
-const PageRow = ({
-  index,
-  style,
-  pages,
-}: {
-  index: number;
-  style: React.CSSProperties;
-} & { pages: Page[] }) => {
-  const page = pages?.[index];
-  if (!page) return null;
-  return (
-    <div style={style}>
-      <AppSidebarPageItem page={page} />
-    </div>
-  );
-};
diff --git a/apps/web/src/app/(app)/@appSidebar/_components/create-page-button.tsx b/apps/web/src/app/(app)/@appSidebar/_components/create-page-button.tsx
index cfcc098..74c607a 100644
--- a/apps/web/src/app/(app)/@appSidebar/_components/create-page-button.tsx
+++ b/apps/web/src/app/(app)/@appSidebar/_components/create-page-button.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import type { Page } from "@acme/db/schema";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { Plus } from "lucide-react";
 import { useRouter } from "next/navigation";
@@ -11,8 +10,13 @@ import {
   SidebarMenuSubItem,
 } from "~/components/ui/sidebar";
 import { useTRPC } from "~/trpc/react";
+import { infinitePagesQueryOptions } from "../../../api/trpc/options/pages-query-options";
 
-export function CreatePageButton() {
+type CreatePageButtonProps = {
+  className?: string;
+};
+
+export function CreatePageButton({ className }: CreatePageButtonProps) {
   const router = useRouter();
   const trpc = useTRPC();
   const queryClient = useQueryClient();
@@ -35,10 +39,32 @@ export function CreatePageButton() {
           onSuccess: (newPage) => {
             // Optimistically update the pages list
             queryClient.setQueryData(
-              trpc.pages.getByUser.queryOptions().queryKey,
-              (oldPages: Page[] | undefined) => {
-                if (!oldPages) return [newPage];
-                return [newPage, ...oldPages];
+              trpc.pages.getPaginated.infiniteQueryOptions(
+                infinitePagesQueryOptions,
+              ).queryKey,
+              (old) => {
+                if (!old)
+                  return {
+                    pageParams: [],
+                    pages: [
+                      {
+                        items: [newPage],
+                        nextCursor: undefined,
+                      },
+                    ],
+                  };
+                const [first, ...rest] = old.pages;
+                return {
+                  ...old,
+                  pages: [
+                    {
+                      ...first,
+                      items: [newPage, ...(first?.items ?? [])],
+                      nextCursor: first?.nextCursor,
+                    },
+                    ...rest,
+                  ],
+                };
               },
             );
 
@@ -53,7 +79,7 @@ export function CreatePageButton() {
   const showLoading = isPending || isCreating;
 
   return (
-    <SidebarMenuSubItem>
+    <SidebarMenuSubItem className={className}>
       <SidebarMenuSubButton asChild>
         <div className="border-2 border-sidebar-border border-dashed">
           <Button
diff --git a/apps/web/src/app/(app)/@appSidebar/_components/delete-page-button.tsx b/apps/web/src/app/(app)/@appSidebar/_components/delete-page-button.tsx
index 6c714d8..7bae74b 100644
--- a/apps/web/src/app/(app)/@appSidebar/_components/delete-page-button.tsx
+++ b/apps/web/src/app/(app)/@appSidebar/_components/delete-page-button.tsx
@@ -15,6 +15,7 @@ import {
   DialogTitle,
 } from "~/components/ui/dialog";
 import { useTRPC } from "~/trpc/react";
+import { infinitePagesQueryOptions } from "../../../api/trpc/options/pages-query-options";
 
 interface DeletePageButtonProps {
   page: Page;
@@ -55,10 +56,18 @@ export function DeletePageButton({ page, className }: DeletePageButtonProps) {
 
             // Optimistically update the pages list
             queryClient.setQueryData(
-              trpc.pages.getByUser.queryOptions().queryKey,
-              (oldPages: Page[] | undefined) => {
-                if (!oldPages) return [];
-                return oldPages.filter((p) => p.id !== page.id);
+              trpc.pages.getPaginated.infiniteQueryOptions(
+                infinitePagesQueryOptions,
+              ).queryKey,
+              (old) => {
+                if (!old) return old;
+                return {
+                  ...old,
+                  pages: old.pages.map((p) => ({
+                    ...p,
+                    items: p.items.filter((p) => p.id !== page.id),
+                  })),
+                };
               },
             );
 
diff --git a/apps/web/src/app/(app)/@appSidebar/default.tsx b/apps/web/src/app/(app)/@appSidebar/default.tsx
index d18f150..81c12fa 100644
--- a/apps/web/src/app/(app)/@appSidebar/default.tsx
+++ b/apps/web/src/app/(app)/@appSidebar/default.tsx
@@ -12,6 +12,7 @@ import {
 import { Skeleton } from "~/components/ui/skeleton";
 import { env } from "~/env";
 import { prefetch, trpc } from "~/trpc/server";
+import { infinitePagesQueryOptions } from "../../api/trpc/options/pages-query-options";
 import { DynamicAppSidebarDevtools } from "./_components/app-sidebar-devtools.dynamic";
 import { AppSidebarNavigation } from "./_components/app-sidebar-main";
 import { AppSidebarPages } from "./_components/app-sidebar-pages";
@@ -19,14 +20,9 @@ import { AppSidebarPagesSkeleton } from "./_components/app-sidebar-pages-skeleto
 import { AppSidebarUser } from "./_components/app-sidebar-user";
 import { AppSidebarUserSkeleton } from "./_components/app-sidebar-user-skeleton";
 
-export const infinitePagesQueryOptions = {
-  direction: "forward" as const,
-  limit: 25,
-} as const;
-
 async function SuspendedAppSidebarPages() {
   prefetch(
-    trpc.pages.getInfinite.infiniteQueryOptions(infinitePagesQueryOptions),
+    trpc.pages.getPaginated.infiniteQueryOptions(infinitePagesQueryOptions),
   );
   return (
     <AppSidebarPages infinitePagesQueryOptions={infinitePagesQueryOptions} />
diff --git a/apps/web/src/app/(app)/journal/_components/journal-list.tsx b/apps/web/src/app/(app)/journal/_components/journal-list.tsx
index 37f8029..47bbb8a 100644
--- a/apps/web/src/app/(app)/journal/_components/journal-list.tsx
+++ b/apps/web/src/app/(app)/journal/_components/journal-list.tsx
@@ -6,6 +6,7 @@ import { useEffect, useMemo } from "react";
 import { Virtuoso } from "react-virtuoso";
 import { useDebouncedCallback } from "use-debounce";
 import { useJournlAgentAwareness } from "~/ai/agents/use-journl-agent-awareness";
+import { infiniteJournalEntriesQueryOptions } from "~/app/api/trpc/options/journal-entries-query-options";
 import { useTRPC } from "~/trpc/react";
 import {
   JournalEntryContent,
@@ -18,23 +19,17 @@ import {
 import { JournalEntryLoader } from "./journal-entry-loader";
 import { JournalListSkeleton } from "./journal-list-skeleton";
 
-type JournalVirtualListProps = {
-  initialRange: {
-    limit: number;
-  };
-} & Omit<
+type JournalVirtualListProps = Omit<
   React.ComponentProps<typeof Virtuoso>,
   "data" | "endReached" | "increaseViewportBy" | "itemContent" | "components"
 >;
 
-export function JournalList({
-  initialRange,
-  ...rest
-}: JournalVirtualListProps) {
+export function JournalList({ ...rest }: JournalVirtualListProps) {
   const trpc = useTRPC();
   const queryClient = useQueryClient();
-  const queryOptions =
-    trpc.journal.getTimeline.infiniteQueryOptions(initialRange);
+  const queryOptions = trpc.journal.getTimeline.infiniteQueryOptions(
+    infiniteJournalEntriesQueryOptions,
+  );
   const { status, data, error, fetchNextPage, hasNextPage } = useInfiniteQuery({
     ...queryOptions,
     gcTime: 0,
diff --git a/apps/web/src/app/(app)/journal/page.tsx b/apps/web/src/app/(app)/journal/page.tsx
index 8dde041..25fc97c 100644
--- a/apps/web/src/app/(app)/journal/page.tsx
+++ b/apps/web/src/app/(app)/journal/page.tsx
@@ -1,12 +1,11 @@
+import { infiniteJournalEntriesQueryOptions } from "~/app/api/trpc/options/journal-entries-query-options";
 import { withAuth } from "~/auth/guards";
 import { prefetch, trpc } from "~/trpc/server";
 import { JournalList } from "./_components/journal-list";
 
-const initialRange: React.ComponentProps<typeof JournalList>["initialRange"] = {
-  limit: 7, // 7 days
-};
-
 export default withAuth(async function JournalPage() {
-  prefetch(trpc.journal.getTimeline.queryOptions(initialRange));
-  return <JournalList initialRange={initialRange} className="h-full w-full" />;
+  prefetch(
+    trpc.journal.getTimeline.queryOptions(infiniteJournalEntriesQueryOptions),
+  );
+  return <JournalList className="h-full w-full" />;
 });
diff --git a/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx b/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx
index 04021ff..63285c8 100644
--- a/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx
+++ b/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx
@@ -7,7 +7,7 @@ import { useDebouncedCallback } from "use-debounce";
 import { FullHeightTextarea } from "~/components/ui/full-height-textarea";
 import { cn } from "~/components/utils";
 import { useTRPC } from "~/trpc/react";
-import { infinitePagesQueryOptions } from "../../@appSidebar/default";
+import { infinitePagesQueryOptions } from "../../../api/trpc/options/pages-query-options";
 
 const DEFAULT_PLACEHOLDER = "New page";
 const DEFAULT_DEBOUNCE_TIME = 150;
@@ -53,9 +53,9 @@ export function PageTitleTextarea({
       },
     );
 
-    // Update the pages.getInfinite query cache from sidebar
+    // Update the pages.getPaginated query cache from sidebar
     queryClient.setQueryData(
-      trpc.pages.getInfinite.infiniteQueryOptions(infinitePagesQueryOptions)
+      trpc.pages.getPaginated.infiniteQueryOptions(infinitePagesQueryOptions)
         .queryKey,
       (old) => {
         if (!old) return old;
diff --git a/apps/web/src/app/api/trpc/options/journal-entries-query-options.tsx b/apps/web/src/app/api/trpc/options/journal-entries-query-options.tsx
new file mode 100644
index 0000000..893866b
--- /dev/null
+++ b/apps/web/src/app/api/trpc/options/journal-entries-query-options.tsx
@@ -0,0 +1,6 @@
+import type { InfiniteJournalEntriesInput } from "@acme/api";
+
+export const infiniteJournalEntriesQueryOptions: InfiniteJournalEntriesInput = {
+  /* 7 days per page */
+  limit: 7,
+};
diff --git a/apps/web/src/app/api/trpc/options/pages-query-options.tsx b/apps/web/src/app/api/trpc/options/pages-query-options.tsx
new file mode 100644
index 0000000..6cba068
--- /dev/null
+++ b/apps/web/src/app/api/trpc/options/pages-query-options.tsx
@@ -0,0 +1,7 @@
+import type { PaginatedPagesInput } from "@acme/api";
+
+export const infinitePagesQueryOptions: PaginatedPagesInput = {
+  direction: "forward",
+  /* 10 (journl) pages per page */
+  limit: 10,
+};
diff --git a/apps/web/turbo.json b/apps/web/turbo.json
index c0014a6..110bdfd 100644
--- a/apps/web/turbo.json
+++ b/apps/web/turbo.json
@@ -8,7 +8,6 @@
     },
     "dev": {
       "dependsOn": ["^build"],
-      "interruptible": true,
       "persistent": true
     }
   }
diff --git a/packages/api/src/api-router/pages.ts b/packages/api/src/api-router/pages.ts
index 56b11d4..ec84c70 100644
--- a/packages/api/src/api-router/pages.ts
+++ b/packages/api/src/api-router/pages.ts
@@ -1,5 +1,5 @@
 import { blocknoteBlocks } from "@acme/blocknote/server";
-import { and, cosineDistance, desc, eq, gt, lt, sql } from "@acme/db";
+import { and, cosineDistance, desc, eq, gt, gte, lte, sql } from "@acme/db";
 import {
   Document,
   DocumentEmbedding,
@@ -114,10 +114,10 @@ export const pagesRouter = {
       });
     }
   }),
-  getInfinite: protectedProcedure
+  getPaginated: protectedProcedure
     .input(
       z.object({
-        cursor: z.iso.datetime().optional(),
+        cursor: z.string().optional(),
         direction: z.enum(["forward", "backward"]).default("forward"),
         limit: z.number().min(1).max(50).default(10),
       }),
@@ -134,28 +134,25 @@ export const pagesRouter = {
               eq(Page.user_id, ctx.session.user.id),
               cursor
                 ? direction === "forward"
-                  ? lt(Page.updated_at, cursor)
-                  : gt(Page.updated_at, cursor)
+                  ? lte(Page.updated_at, cursor)
+                  : gte(Page.updated_at, cursor)
                 : undefined,
             ),
           )
           .orderBy(desc(Page.updated_at))
           .limit(limit + 1);
 
-        let nextCursor: string | undefined;
-        if (pages.length > limit) {
-          const nextItem = pages.pop();
-          nextCursor = nextItem?.updated_at
-            ? new Date(nextItem.updated_at).toISOString()
-            : undefined;
-        }
+        const items =
+          pages.length <= 1 ? pages : pages.slice(0, pages.length - 1);
+        const [nextPage] = pages.length <= 1 ? [] : pages.slice(-1);
+        const nextCursor: string | undefined = nextPage?.updated_at;
 
         return {
-          items: pages,
+          items,
           nextCursor,
         };
       } catch (error) {
-        console.error("Database error in pages.getInfinite:", error);
+        console.error("Database error in pages.getPaginated:", error);
         throw new TRPCError({
           code: "INTERNAL_SERVER_ERROR",
           message: "Failed to fetch pages",
diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
index f4c319c..25b7ffa 100644
--- a/packages/api/src/types.ts
+++ b/packages/api/src/types.ts
@@ -24,3 +24,11 @@ export type UpgradedSubscription = inferProcedureOutput<
 export type BillingPortal = inferProcedureOutput<
   ApiRouter["subscription"]["createBillingPortal"]
 >;
+
+export type PaginatedPagesInput = inferProcedureInput<
+  ApiRouter["pages"]["getPaginated"]
+>;
+
+export type InfiniteJournalEntriesInput = inferProcedureInput<
+  ApiRouter["journal"]["getTimeline"]
+>;
diff --git a/packages/db/src/core/page.schema.ts b/packages/db/src/core/page.schema.ts
index 43dc73a..db05147 100644
--- a/packages/db/src/core/page.schema.ts
+++ b/packages/db/src/core/page.schema.ts
@@ -1,5 +1,5 @@
 import { relations, sql } from "drizzle-orm";
-import { pgTable, text, varchar } from "drizzle-orm/pg-core";
+import { index, pgTable, text, varchar } from "drizzle-orm/pg-core";
 import { createInsertSchema, createSelectSchema } from "drizzle-zod";
 import { z } from "zod/v4";
 import { user } from "../auth/user.schema.js";
@@ -7,26 +7,36 @@ import { TEXT_LIMITS } from "../constants/resource-limits.js";
 import { BlockEdge, BlockNode } from "./block-node.schema.js";
 import { Document } from "./document.schema.js";
 
-export const Page = pgTable("page", (t) => ({
-  id: t.uuid().notNull().primaryKey().defaultRandom(),
-  user_id: text()
-    .notNull()
-    .references(() => user.id, { onDelete: "cascade" }),
-  document_id: t
-    .uuid()
-    .notNull()
-    .references(() => Document.id, { onDelete: "cascade" }),
-  title: varchar("title", { length: TEXT_LIMITS.PAGE_TITLE }).notNull(),
-  created_at: t
-    .timestamp({ mode: "string", withTimezone: true })
-    .defaultNow()
-    .notNull(),
-  updated_at: t
-    .timestamp({ mode: "string", withTimezone: true })
-    .defaultNow()
-    .notNull()
-    .$onUpdateFn(() => sql`now()`),
-}));
+export const Page = pgTable(
+  "page",
+  (t) => ({
+    id: t.uuid().notNull().primaryKey().defaultRandom(),
+    user_id: text()
+      .notNull()
+      .references(() => user.id, { onDelete: "cascade" }),
+    document_id: t
+      .uuid()
+      .notNull()
+      .references(() => Document.id, { onDelete: "cascade" }),
+    title: varchar("title", { length: TEXT_LIMITS.PAGE_TITLE }).notNull(),
+    created_at: t
+      .timestamp({ mode: "string", withTimezone: true })
+      .defaultNow()
+      .notNull(),
+    updated_at: t
+      .timestamp({ mode: "string", withTimezone: true })
+      .defaultNow()
+      .notNull()
+      .$onUpdateFn(() => sql`now()`),
+  }),
+  (t) => [
+    index("page_user_id_updated_at_index").using(
+      "btree",
+      t.user_id,
+      t.updated_at,
+    ),
+  ],
+);
 
 export const PageRelations = relations(Page, ({ many }) => ({
   block_nodes: many(BlockNode),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac89afb..0179d10 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -245,9 +245,6 @@ importers:
       react-virtuoso:
         specifier: ~4.13.0
         version: 4.13.0(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
-      react-window:
-        specifier: ^2.1.1
-        version: 2.1.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
       remark-gfm:
         specifier: ~4.0.1
         version: 4.0.1
@@ -5803,12 +5800,6 @@ packages:
       react: '>=16 || >=17 || >= 18 || >= 19'
       react-dom: '>=16 || >=17 || >= 18 || >=19'
 
-  react-window@2.1.1:
-    resolution: {integrity: sha512-Wx5yHri8G1nFxImnJRkEEKtRTnG3cWaqknUJyYvgisQtl1mw/d8LQmLXfuKxpn2dY8IwDn5mCIuxm2NVyIvgVQ==}
-    peerDependencies:
-      react: ^18.0.0 || ^19.0.0
-      react-dom: ^18.0.0 || ^19.0.0
-
   react@19.1.1:
     resolution: {integrity: sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==}
     engines: {node: '>=0.10.0'}
@@ -12832,11 +12823,6 @@ snapshots:
       react: 19.1.1
       react-dom: 19.1.1(react@19.1.1)
 
-  react-window@2.1.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
-    dependencies:
-      react: 19.1.1
-      react-dom: 19.1.1(react@19.1.1)
-
   react@19.1.1: {}
 
   readable-stream@3.6.2: