diff --git a/packages/ui/src/components/chat/ChatInput.tsx b/packages/ui/src/components/chat/ChatInput.tsx
index 00d7cccf..f7c8eae2 100644
--- a/packages/ui/src/components/chat/ChatInput.tsx
+++ b/packages/ui/src/components/chat/ChatInput.tsx
@@ -4265,6 +4265,7 @@ const ChatInputComponent: React.FC<ChatInputProps> = ({ onOpenSettings, scrollTo
         if (!isMobile || !isMobileExpanded || isCapacitorApp()) return;
         const vv = window.visualViewport;
         const form = composerFormRef.current;
+        const textarea = textareaRef.current;
         if (!vv || !form) return;
         // The form is trapped inside lower stacking contexts (the composer
         // wrapper's z-10), so it cannot out-stack the app header with z-index
@@ -4299,7 +4300,6 @@ const ChatInputComponent: React.FC<ChatInputProps> = ({ onOpenSettings, scrollTo
             // session and won't re-reveal the (still focused) field on its own,
             // which left the composer parked behind the keyboard.
             requestAnimationFrame(() => {
-                const textarea = textareaRef.current;
                 if (textarea && document.activeElement === textarea) {
                     textarea.scrollIntoView({ block: 'nearest' });
                 }
diff --git a/packages/ui/src/components/chat/message/TextSelectionMenu.tsx b/packages/ui/src/components/chat/message/TextSelectionMenu.tsx
index d100267b..3e5b1199 100644
--- a/packages/ui/src/components/chat/message/TextSelectionMenu.tsx
+++ b/packages/ui/src/components/chat/message/TextSelectionMenu.tsx
@@ -544,7 +544,7 @@ export const TextSelectionMenu: React.FC<TextSelectionMenuProps> = ({ containerR
     } finally {
       setIsAddingToNotes(false);
     }
-  }, [currentProjectRef, hideMenu, selectedText, selectedTextMarkdown, t]);
+  }, [currentProjectRef, currentSessionId, hideMenu, selectedText, selectedTextMarkdown, t]);
 
   if (!position.show) return null;