diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index b19e1240364..04a62e2b808 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -800,6 +800,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   const [isComposerFooterCompact, setIsComposerFooterCompact] = useState(false);
   const [isComposerPrimaryActionsCompact, setIsComposerPrimaryActionsCompact] = useState(false);
   const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);
+  const handleComposerModelPickerOpenChange = useCallback((open: boolean) => {
+    setIsComposerModelPickerOpen(open);
+  }, []);
   const [isComposerFocused, setIsComposerFocused] = useState(false);
   const isMobileViewport = useMediaQuery("max-sm");
   const isComposerCollapsedMobile = isMobileViewport && !isComposerFocused;
@@ -2340,9 +2343,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                         activeProviderIconClassName: composerProviderState.modelPickerIconClassName,
                       }
                     : {})}
-                  onOpenChange={(open) => {
-                    setIsComposerModelPickerOpen(open);
-                  }}
+                  onOpenChange={handleComposerModelPickerOpenChange}
                   onInstanceModelChange={onProviderModelSelect}
                 />
 
diff --git a/artifacts/react-scan-after/composer-model-picker-after.webm b/artifacts/react-scan-after/composer-model-picker-after.webm
new file mode 100644
index 00000000000..9b60c0a1aa7
Binary files /dev/null and b/artifacts/react-scan-after/composer-model-picker-after.webm differ
diff --git a/artifacts/react-scan-before/composer-model-picker-before.webm b/artifacts/react-scan-before/composer-model-picker-before.webm
new file mode 100644
index 00000000000..2e4927f75f6
Binary files /dev/null and b/artifacts/react-scan-before/composer-model-picker-before.webm differ