diff --git a/packages/react-ui/src/components/AgentInterface/conversationStarter.scss b/packages/react-ui/src/components/AgentInterface/conversationStarter.scss
index 5a711aff7..8fa69ee86 100644
--- a/packages/react-ui/src/components/AgentInterface/conversationStarter.scss
+++ b/packages/react-ui/src/components/AgentInterface/conversationStarter.scss
@@ -20,6 +20,7 @@
   // Short variant - horizontal pill buttons
   &--short {
     display: block;
+    max-width: 768px;
   }
 
   // Long variant - vertical stacked list
@@ -27,6 +28,7 @@
     display: flex;
     flex-direction: column;
     gap: 0;
+    max-width: 768px;
     margin-bottom: cssUtils.$space-m;
   }
 
@@ -53,6 +55,12 @@
   }
 }
 
+.openui-agent-container:not(.openui-agent-container--mobile)
+  .openui-agent-composer-slot
+  > .openui-agent-conversation-starter {
+  width: calc(100% - #{cssUtils.$space-m-l} - #{cssUtils.$space-m-l});
+}
+
 // Short variant item (pill-style buttons)
 .openui-agent-conversation-starter-item-short {
   display: flex;
diff --git a/packages/react-ui/src/components/AgentInterface/stories/AgentInterface.stories.tsx b/packages/react-ui/src/components/AgentInterface/stories/AgentInterface.stories.tsx
index c15c630f9..78ceb8638 100644
--- a/packages/react-ui/src/components/AgentInterface/stories/AgentInterface.stories.tsx
+++ b/packages/react-ui/src/components/AgentInterface/stories/AgentInterface.stories.tsx
@@ -217,13 +217,24 @@ export const WithWelcome = {
 
 /** Composer-only starters (no Welcome) — chips above the input. */
 export const ComposerStarters = {
-  render: () => (
+  args: {
+    starterVariant: "short",
+  },
+  argTypes: {
+    starterVariant: {
+      control: "select",
+      options: ["short", "long"],
+      description: "Switch between pill and list-style conversation starters.",
+    },
+  },
+  render: ({ starterVariant }: { starterVariant: "short" | "long" }) => (
     <AgentInterface
       storage={emptyStorage}
       llm={echoLLM}
       logoUrl={logoUrl}
       agentName="OpenUI"
       starters={COMPOSER_STARTERS}
+      starterVariant={starterVariant}
     />
   ),
 };
diff --git a/packages/react-ui/src/components/AgentInterface/welcomeScreen.scss b/packages/react-ui/src/components/AgentInterface/welcomeScreen.scss
index 5e93f0dd7..63a65730d 100644
--- a/packages/react-ui/src/components/AgentInterface/welcomeScreen.scss
+++ b/packages/react-ui/src/components/AgentInterface/welcomeScreen.scss
@@ -124,10 +124,6 @@ $center-align-spacing: calc(32px + cssUtils.$space-s);
     .openui-agent-conversation-starter--short {
       justify-content: center;
     }
-
-    .openui-agent-conversation-starter--long {
-      max-width: 770px;
-    }
   }
 
   // When welcome screen has the desktop composer variant