diff --git a/apps/web/src/features/tracks/components/TrackSearch.stories.tsx b/apps/web/src/features/tracks/components/TrackSearch.stories.tsx
index 819d05d84..6d98a4146 100644
--- a/apps/web/src/features/tracks/components/TrackSearch.stories.tsx
+++ b/apps/web/src/features/tracks/components/TrackSearch.stories.tsx
@@ -8,7 +8,7 @@ const meta: Meta<typeof TrackSearch> = {
     tags: ['autodocs'],
     decorators: [
         (Story) => (
-            <div className="bg-kodo-background p-4">
+            <div className="w-full max-w-4xl p-4 bg-background border border-border rounded-[var(--radius-xl)] min-h-layout-story">
                 <Story />
             </div>
         ),
diff --git a/apps/web/src/features/tracks/components/TrackSearchResults.stories.tsx b/apps/web/src/features/tracks/components/TrackSearchResults.stories.tsx
index a1634ac45..7eeaec91b 100644
--- a/apps/web/src/features/tracks/components/TrackSearchResults.stories.tsx
+++ b/apps/web/src/features/tracks/components/TrackSearchResults.stories.tsx
@@ -8,7 +8,7 @@ const meta: Meta<typeof TrackSearchResults> = {
     tags: ['autodocs'],
     decorators: [
         (Story) => (
-            <div className="bg-kodo-background p-4 min-h-screen">
+            <div className="w-full max-w-4xl p-4 bg-background border border-border rounded-[var(--radius-xl)] min-h-layout-story">
                 <Story />
             </div>
         ),
diff --git a/apps/web/src/features/tracks/components/comment-thread/CommentThreadSkeleton.stories.tsx b/apps/web/src/features/tracks/components/comment-thread/CommentThreadSkeleton.stories.tsx
index 76b9f6f9b..276bdc0d0 100644
--- a/apps/web/src/features/tracks/components/comment-thread/CommentThreadSkeleton.stories.tsx
+++ b/apps/web/src/features/tracks/components/comment-thread/CommentThreadSkeleton.stories.tsx
@@ -9,7 +9,7 @@ const meta: Meta<typeof CommentThreadSkeleton> = {
     },
     decorators: [
         (Story) => (
-            <div className="max-w-2xl w-full p-4 border rounded-lg bg-background min-h-layout-story space-y-4">
+            <div className="max-w-2xl w-full p-4 border border-border rounded-[var(--radius-xl)] bg-background min-h-layout-story space-y-4">
                 <Story />
                 <CommentThreadSkeleton />
                 <CommentThreadSkeleton />