diff --git a/apps/web/src/components/chat/ComposerControlsBar.tsx b/apps/web/src/components/chat/ComposerControlsBar.tsx
index 8523c25927fa..0002beeaf9fe 100644
--- a/apps/web/src/components/chat/ComposerControlsBar.tsx
+++ b/apps/web/src/components/chat/ComposerControlsBar.tsx
@@ -193,6 +193,8 @@ export function ComposerControlsBar(props: {
       environmentId={environmentId}
       compact={false}
       isComposerOwned
+      // The trigger grows away from this edge when its model or effort label changes.
+      popupAlign={composerControlsCollapsed ? "start" : "end"}
       disabled={providerCatalogPending || isSendBusy}
       multipleModelsEnabled={multipleModelsEnabled}
       multipleModelSelections={multipleModelSelections}
diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx
index cfc74a515e3a..1680e8d426b0 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.tsx
@@ -90,6 +90,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
   disabled?: boolean;
   terminalOpen?: boolean;
   open?: boolean;
+  popupAlign?: "start" | "end";
   triggerClassName?: string;
   triggerLabel?: string;
   triggerAriaLabel?: string;
@@ -392,7 +393,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
           };
         }}
         initialFocus={searchInputRef}
-        align="start"
+        align={props.popupAlign ?? "start"}
+        collisionAvoidance={docked ? { align: "shift", fallbackAxisSide: "none" } : undefined}
         className="before:hidden"
         padding="none"
         touchBackdrop