diff --git a/packages/mobile/app.json b/packages/mobile/app.json
index 7e66845b9..04e78a318 100644
--- a/packages/mobile/app.json
+++ b/packages/mobile/app.json
@@ -30,8 +30,7 @@
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#0d1117"
       },
-      "package": "com.composio.aomobile",
-      "softwareKeyboardLayoutMode": "pan"
+      "package": "com.composio.aomobile"
     },
     "web": {
       "favicon": "./assets/favicon.png"
diff --git a/packages/mobile/src/screens/SessionDetailScreen.tsx b/packages/mobile/src/screens/SessionDetailScreen.tsx
index c60e1b10a..1be162ce6 100644
--- a/packages/mobile/src/screens/SessionDetailScreen.tsx
+++ b/packages/mobile/src/screens/SessionDetailScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useRef } from "react";
+import React, { useState, useCallback, useRef, useEffect } from "react";
 import {
   View,
   Text,
@@ -8,7 +8,7 @@ import {
   TouchableOpacity,
   Alert,
   ActivityIndicator,
-  KeyboardAvoidingView,
+  Keyboard,
   Platform,
   Linking,
 } from "react-native";
@@ -43,6 +43,24 @@ export default function SessionDetailScreen({ route, navigation }: Props) {
   const [ciFixState, setCiFixState] = useState<ActionButtonState>("idle");
   const [commentFixStates, setCommentFixStates] = useState<Record<string, ActionButtonState>>({});
   const scrollRef = useRef<ScrollView>(null);
+  const [keyboardHeight, setKeyboardHeight] = useState(0);
+
+  useEffect(() => {
+    const showEvent = Platform.OS === "ios" ? "keyboardWillShow" : "keyboardDidShow";
+    const hideEvent = Platform.OS === "ios" ? "keyboardWillHide" : "keyboardDidHide";
+
+    const showSub = Keyboard.addListener(showEvent, (e) => {
+      setKeyboardHeight(e.endCoordinates.height);
+    });
+    const hideSub = Keyboard.addListener(hideEvent, () => {
+      setKeyboardHeight(0);
+    });
+
+    return () => {
+      showSub.remove();
+      hideSub.remove();
+    };
+  }, []);
 
   const handleSend = useCallback(async () => {
     if (!message.trim()) return;
@@ -162,11 +180,7 @@ export default function SessionDetailScreen({ route, navigation }: Props) {
   const unresolvedComments = pr?.unresolvedComments ?? [];
 
   return (
-    <KeyboardAvoidingView
-      style={styles.root}
-      behavior="padding"
-      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 140}
-    >
+    <View style={styles.root}>
       <ScrollView ref={scrollRef} style={styles.container} contentContainerStyle={styles.content} keyboardShouldPersistTaps="handled">
         {/* Header row */}
         <View style={[styles.headerCard, { borderLeftColor: color }]}>
@@ -336,7 +350,7 @@ export default function SessionDetailScreen({ route, navigation }: Props) {
 
       {/* Message input — only show for active sessions */}
       {!isDone && (
-        <View style={styles.messageBar}>
+        <View style={[styles.messageBar, { paddingBottom: keyboardHeight > 0 ? keyboardHeight - (Platform.OS === "ios" ? 34 : 0) : 10 }]}>
           <TextInput
             style={styles.messageInput}
             placeholder="Send message to agent..."
@@ -347,9 +361,6 @@ export default function SessionDetailScreen({ route, navigation }: Props) {
             returnKeyType="send"
             onSubmitEditing={handleSend}
             blurOnSubmit={false}
-            onFocus={() => {
-              setTimeout(() => scrollRef.current?.scrollToEnd({ animated: true }), 300);
-            }}
           />
           <TouchableOpacity
             style={[styles.sendButton, (!message.trim() || sending) && styles.sendButtonDisabled]}
@@ -364,7 +375,7 @@ export default function SessionDetailScreen({ route, navigation }: Props) {
           </TouchableOpacity>
         </View>
       )}
-    </KeyboardAvoidingView>
+    </View>
   );
 }
 
diff --git a/packages/mobile/src/screens/SettingsScreen.tsx b/packages/mobile/src/screens/SettingsScreen.tsx
index e28e248bc..0b9ac101f 100644
--- a/packages/mobile/src/screens/SettingsScreen.tsx
+++ b/packages/mobile/src/screens/SettingsScreen.tsx
@@ -132,8 +132,7 @@ export default function SettingsScreen({ navigation }: Props) {
   return (
     <KeyboardAvoidingView
       style={styles.root}
-      behavior="padding"
-      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 140}
+      behavior={Platform.OS === "ios" ? "padding" : undefined}
     >
       <ScrollView style={styles.container} contentContainerStyle={styles.content}>
         <View style={styles.section}>
diff --git a/packages/mobile/src/screens/SpawnSessionScreen.tsx b/packages/mobile/src/screens/SpawnSessionScreen.tsx
index 34163e3f5..0d52a696c 100644
--- a/packages/mobile/src/screens/SpawnSessionScreen.tsx
+++ b/packages/mobile/src/screens/SpawnSessionScreen.tsx
@@ -52,8 +52,7 @@ export default function SpawnSessionScreen({ navigation }: Props) {
   return (
     <KeyboardAvoidingView
       style={styles.root}
-      behavior="padding"
-      keyboardVerticalOffset={Platform.OS === "ios" ? 88 : 140}
+      behavior={Platform.OS === "ios" ? "padding" : undefined}
     >
       <ScrollView style={styles.container} contentContainerStyle={styles.content}>
         <View style={styles.section}>