diff --git a/apps/mobile/src/app/(tabs)/fertilizers.tsx b/apps/mobile/src/app/(tabs)/fertilizers.tsx
index c0f6c98..09c818a 100644
--- a/apps/mobile/src/app/(tabs)/fertilizers.tsx
+++ b/apps/mobile/src/app/(tabs)/fertilizers.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Modal, ScrollView, StyleSheet, Switch, Text, TouchableOpacity, View } from 'react-native'
+import { KeyboardAvoidingView, Modal, Platform, ScrollView, StyleSheet, Switch, Text, TouchableOpacity, View } from 'react-native'
 import { useLayoutEffect } from 'react'
 import { useLocalSearchParams, useNavigation } from 'expo-router'
 import { keepPreviousData } from '@tanstack/react-query'
@@ -545,7 +545,7 @@ export function FertilizersScreen() {
   )
 }
 
-function AddEditFertilizerModal({
+export function AddEditFertilizerModal({
   formData,
   isVisible,
   mode,
@@ -582,7 +582,11 @@ function AddEditFertilizerModal({
       presentationStyle='fullScreen'
       onRequestClose={onClose}
     >
-      <View style={{ flex: 1, backgroundColor: palette.background }}>
+      <KeyboardAvoidingView
+        style={{ flex: 1, backgroundColor: palette.background }}
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
+      >
         <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', padding: 20, paddingTop: 60, borderBottomWidth: 1, borderBottomColor: palette.border, backgroundColor: palette.surface }}>
           <Text style={styles.formTitle}>
             {mode === 'add' ? 'Add New Fertilizer' : 'Edit Fertilizer'}
@@ -591,7 +595,11 @@ function AddEditFertilizerModal({
             <Text style={{ fontSize: 24, color: palette.textPrimary }}>✕</Text>
           </TouchableOpacity>
         </View>
-        <ScrollView style={[styles.formContainer, { flex: 1 }]}>
+        <ScrollView
+          style={[styles.formContainer, { flex: 1 }]}
+          keyboardShouldPersistTaps="handled"
+          contentContainerStyle={{ paddingBottom: 24 }}
+        >
           <Text style={styles.inputLabel}>Name</Text>
           <TextInput
             style={styles.input}
@@ -600,6 +608,16 @@ function AddEditFertilizerModal({
             onChangeText={(text) => onChange({ ...formData, name: text })}
           />
 
+          <Text style={styles.inputLabel}>Notes (optional)</Text>
+          <TextInput
+            style={[styles.input, styles.textArea]}
+            placeholder="Notes (optional)"
+            value={formData.notes}
+            onChangeText={(text) => onChange({ ...formData, notes: text })}
+            multiline
+            numberOfLines={3}
+          />
+
           <Text style={styles.inputLabel}>Type</Text>
           <View
             style={localStyles.typeContainer}
@@ -664,16 +682,6 @@ function AddEditFertilizerModal({
             keyboardType="numeric"
           />
 
-          <Text style={styles.inputLabel}>Notes (optional)</Text>
-          <TextInput
-            style={[styles.input, styles.textArea]}
-            placeholder="Notes (optional)"
-            value={formData.notes}
-            onChangeText={(text) => onChange({ ...formData, notes: text })}
-            multiline
-            numberOfLines={3}
-          />
-
           {mutation.error && (
             <Text style={styles.errorText}>
               Error: {mutation.error.message}
@@ -699,7 +707,7 @@ function AddEditFertilizerModal({
             </Text>
           </TouchableOpacity>
         </ScrollView>
-      </View>
+      </KeyboardAvoidingView>
     </Modal>
   )
 }
diff --git a/apps/mobile/src/app/__tests__/keyboard-visibility.test.tsx b/apps/mobile/src/app/__tests__/keyboard-visibility.test.tsx
new file mode 100644
index 0000000..7d383b6
--- /dev/null
+++ b/apps/mobile/src/app/__tests__/keyboard-visibility.test.tsx
@@ -0,0 +1,260 @@
+import React, { act } from 'react'
+import { render, fireEvent, screen } from '@testing-library/react-native'
+
+import { AddEditChoreModal } from '../../components/AddEditChoreModal'
+
+import  { AddEditFertilizerModal } from '../(tabs)/fertilizers'
+import AddEditPlantScreen from '../plants/add-edit'
+
+// Mock vector icons so Icon components don't trigger async updates (e.g. font load) that cause act(...) warnings.
+// Factory must not reference out-of-scope variables; require inside the factory.
+jest.mock('@expo/vector-icons', () => {
+  const React = require('react')
+  const { View } = require('react-native')
+
+  return {
+    Ionicons: (props: unknown) => React.createElement(View, { ...(props as object), testID: 'icon' }),
+  }
+})
+
+// Mocks for navigation and routing used by the screens
+jest.mock('expo-router', () => ({
+  useLocalSearchParams: jest.fn(() => ({})),
+  useNavigation: jest.fn(() => ({
+    getParent: () => ({ setOptions: jest.fn() }),
+  })),
+  useRouter: jest.fn(() => ({
+    back: jest.fn(),
+  })),
+}))
+
+// Mock Alert context to avoid needing a real provider
+jest.mock('../../contexts/AlertContext', () => ({
+  useAlert: () => ({
+    alert: jest.fn(),
+  }),
+}))
+
+// Avoid needing a real React Query client for focus refresh logic
+jest.mock('../../hooks/useRefetchOnFocus', () => ({
+  useRefreshOnFocus: jest.fn(),
+}))
+
+// Mock tRPC hooks used by the screens
+jest.mock('../../trpc', () => {
+  const plantsListUseQuery = jest.fn()
+  const plantsCreateUseMutation = jest.fn()
+  const plantsUpdateUseMutation = jest.fn()
+  const plantsIdentifyUseMutation = jest.fn()
+  const speciesListUseQuery = jest.fn()
+
+  const fertilizersListUseQuery = jest.fn()
+  const fertilizersCreateUseMutation = jest.fn()
+  const fertilizersUpdateUseMutation = jest.fn()
+  const fertilizersDeleteUseMutation = jest.fn()
+  const fertilizersArchiveUseMutation = jest.fn()
+  const fertilizersUnarchiveUseMutation = jest.fn()
+
+  return {
+    trpc: {
+      plants: {
+        list: { useQuery: plantsListUseQuery },
+        create: { useMutation: plantsCreateUseMutation },
+        update: { useMutation: plantsUpdateUseMutation },
+        identifyByImages: { useMutation: plantsIdentifyUseMutation },
+      },
+      species: {
+        list: { useQuery: speciesListUseQuery },
+      },
+      fertilizers: {
+        list: { useQuery: fertilizersListUseQuery },
+        create: { useMutation: fertilizersCreateUseMutation },
+        update: { useMutation: fertilizersUpdateUseMutation },
+        delete: { useMutation: fertilizersDeleteUseMutation },
+        archive: { useMutation: fertilizersArchiveUseMutation },
+        unarchive: { useMutation: fertilizersUnarchiveUseMutation },
+      },
+    },
+  }
+})
+
+const getTrpcMock = () => (jest.requireMock('../../trpc').trpc as any)
+
+describe('Keyboard visibility for multiline inputs', () => {
+  describe('Add/Edit Chore modal', () => {
+    it('keeps Notes input scrollable when focused so it can move above the keyboard', () => {
+      const formData = {
+        description: '',
+        lifecycles: [],
+        fertilizers: [],
+        recurAmount: '',
+        recurUnit: '',
+        notes: '',
+      } as any
+
+      const { getByPlaceholderText } = render(
+        <AddEditChoreModal
+          fertilizersData={{ fertilizers: [] }}
+          formData={formData}
+          isVisible={true}
+          mode="add"
+          mutation={{ error: null, isPending: false }}
+          onChange={jest.fn()}
+          onClose={jest.fn()}
+          onSubmit={jest.fn()}
+        />
+      )
+
+      const notesInput = getByPlaceholderText('Notes (optional)')
+
+      expect(notesInput.props.multiline).toBe(true)
+      expect(notesInput.props.scrollEnabled).toBe(false)
+
+      act(() => {
+        fireEvent(notesInput, 'focus')
+      })
+      const notesFocused = getByPlaceholderText('Notes (optional)')
+      expect(notesFocused.props.scrollEnabled).toBe(true)
+
+      act(() => {
+        fireEvent(notesFocused, 'blur')
+      })
+      const notesBlurred = getByPlaceholderText('Notes (optional)')
+      expect(notesBlurred.props.scrollEnabled).toBe(false)
+    })
+  })
+
+  describe('Add/Edit Fertilizer modal', () => {
+    it('keeps Notes input scrollable when focused so it can move above the keyboard', () => {
+      const { getByPlaceholderText } = render(
+        <AddEditFertilizerModal
+          formData={{
+            name: '',
+            type: 'liquid',
+            isOrganic: false,
+            notes: '',
+            nitrogen: '',
+            phosphorus: '',
+            potassium: '',
+          }}
+          isVisible={true}
+          mode="add"
+          mutation={{ error: null, isPending: false }}
+          onChange={jest.fn()}
+          onClose={jest.fn()}
+          onSubmit={jest.fn()}
+        />
+      )
+
+      const notesInput = getByPlaceholderText('Notes (optional)')
+
+      expect(notesInput.props.multiline).toBe(true)
+      expect(notesInput.props.scrollEnabled).toBe(false)
+
+      act(() => {
+        fireEvent(notesInput, 'focus')
+      })
+      const notesFocused = getByPlaceholderText('Notes (optional)')
+      expect(notesFocused.props.scrollEnabled).toBe(true)
+
+      act(() => {
+        fireEvent(notesFocused, 'blur')
+      })
+      const notesBlurred = getByPlaceholderText('Notes (optional)')
+      expect(notesBlurred.props.scrollEnabled).toBe(false)
+    })
+  })
+
+  describe('Add/Edit Plant screen', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
+    it('hides Notes on Add until a species is set, then keeps it scrollable when focused', () => {
+      const trpc = getTrpcMock()
+
+      // In Add mode: plants.list is disabled, but species.list may be called
+      trpc.plants.list.useQuery.mockReturnValue({
+        data: { plants: [] },
+        isLoading: false,
+        isError: false,
+        error: null,
+        isRefetching: false,
+        refetch: jest.fn(),
+      })
+
+      trpc.species.list.useQuery.mockReturnValue({
+        data: { species: [] },
+        isLoading: false,
+      })
+
+      trpc.plants.create.useMutation.mockReturnValue({
+        mutate: jest.fn(),
+        isPending: false,
+        error: null,
+      })
+
+      trpc.plants.update.useMutation.mockReturnValue({
+        mutate: jest.fn(),
+        isPending: false,
+        error: null,
+      })
+
+      trpc.plants.identifyByImages.useMutation.mockReturnValue({
+        mutate: jest.fn(),
+        isPending: false,
+        error: null,
+      })
+
+      // Add mode: no id in params
+      const expoRouter = jest.requireMock('expo-router')
+      expoRouter.useLocalSearchParams.mockReturnValue({})
+
+      const { rerender } = render(<AddEditPlantScreen />)
+
+      // Simulate that a species has been chosen by setting speciesId in form data via rerender.
+      // We can't access internal state directly, but we can re-render the screen in "edit" mode
+      // with a plant that has speciesId set, which uses the same Notes rendering logic.
+      expoRouter.useLocalSearchParams.mockReturnValue({ id: 'plant-1' })
+
+      trpc.plants.list.useQuery.mockReturnValue({
+        data: {
+          plants: [
+            {
+              _id: 'plant-1',
+              name: 'Tomato',
+              plantedAt: null,
+              lifecycle: 'start',
+              notes: '',
+              species: { _id: 'species-1' },
+            },
+          ],
+        },
+        isLoading: false,
+        isError: false,
+        error: null,
+        isRefetching: false,
+        refetch: jest.fn(),
+      })
+
+      rerender(<AddEditPlantScreen />)
+
+      const notesInput = screen.getByPlaceholderText('Notes (optional)')
+      expect(notesInput.props.multiline).toBe(true)
+      expect(notesInput.props.scrollEnabled).toBe(false)
+
+      act(() => {
+        fireEvent(notesInput, 'focus')
+      })
+      const notesFocused = screen.getByPlaceholderText('Notes (optional)')
+      expect(notesFocused.props.scrollEnabled).toBe(true)
+
+      act(() => {
+        fireEvent(notesFocused, 'blur')
+      })
+      const notesBlurred = screen.getByPlaceholderText('Notes (optional)')
+      expect(notesBlurred.props.scrollEnabled).toBe(false)
+    })
+  })
+})
+
diff --git a/apps/mobile/src/app/plants/add-edit.tsx b/apps/mobile/src/app/plants/add-edit.tsx
index c856a43..7f964eb 100644
--- a/apps/mobile/src/app/plants/add-edit.tsx
+++ b/apps/mobile/src/app/plants/add-edit.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { ActivityIndicator, Image, Linking, Modal, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
+import { ActivityIndicator, Image, KeyboardAvoidingView, Linking, Modal, Platform, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import * as Device from 'expo-device'
 import * as ImagePicker from 'expo-image-picker'
 import { Ionicons } from '@expo/vector-icons'
@@ -375,233 +375,248 @@ export function AddEditPlantScreen() {
           </TouchableOpacity>
         </View>
       )) || (
-        <ScrollView
-          onTouchEnd={() => {
-            if (showSpeciesSuggestions) {
-              setShowSpeciesSuggestions(false)
-            }
-          }}
+        <KeyboardAvoidingView
+          style={{ flex: 1 }}
+          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+          keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
         >
-          <View
-            style={{
-              marginBottom: 14,
-              borderRadius: 14,
-              backgroundColor: palette.surfaceMuted,
-              borderWidth: 2,
-              borderColor: palette.border,
-              borderStyle: 'dashed',
+          <ScrollView
+            onTouchEnd={() => {
+              if (showSpeciesSuggestions) {
+                setShowSpeciesSuggestions(false)
+              }
             }}
+            keyboardShouldPersistTaps="handled"
+            contentContainerStyle={{ paddingBottom: 24 }}
           >
-            {identificationPhotoUri && (
-              <Image
-                source={{ uri: identificationPhotoUri }}
-                style={{ width: '100%', height: 200, borderRadius: 14, backgroundColor: palette.surfaceMuted }}
-                resizeMode='cover'
-              />
-            )}
+            <View
+              style={{
+                marginBottom: 14,
+                borderRadius: 14,
+                backgroundColor: palette.surfaceMuted,
+                borderWidth: 2,
+                borderColor: palette.border,
+                borderStyle: 'dashed',
+              }}
+            >
+              {identificationPhotoUri && (
+                <Image
+                  source={{ uri: identificationPhotoUri }}
+                  style={{ width: '100%', height: 200, borderRadius: 14, backgroundColor: palette.surfaceMuted }}
+                  resizeMode='cover'
+                />
+              )}
 
-            <View style={{ paddingVertical: identificationPhotoUri ? 12 : 24 }}>
-              <TouchableOpacity
-                onPress={onPressTakePhoto}
-                style={[localStyles.takePhotoButtonContainer, { paddingBottom: 12 }]}
-              >
-                <Ionicons name='camera' size={48} color={palette.primary} />
-                <Text style={{ fontSize: 18, fontWeight: '600', color: palette.textPrimary }}>{identificationPhotoUri ? 'Retake' : 'Take'} Photo</Text>
-              </TouchableOpacity>
-
-              <TouchableOpacity
-                onPress={onPressChoosePhotoFromLibrary}
-                style={{ margin: 'auto' }}
-              >
-                <Text style={styles.link}>Or choose from library</Text>
-              </TouchableOpacity>
+              <View style={{ paddingVertical: identificationPhotoUri ? 12 : 24 }}>
+                <TouchableOpacity
+                  onPress={onPressTakePhoto}
+                  style={[localStyles.takePhotoButtonContainer, { paddingBottom: 12 }]}
+                >
+                  <Ionicons name='camera' size={48} color={palette.primary} />
+                  <Text style={{ fontSize: 18, fontWeight: '600', color: palette.textPrimary }}>{identificationPhotoUri ? 'Retake' : 'Take'} Photo</Text>
+                </TouchableOpacity>
+
+                <TouchableOpacity
+                  onPress={onPressChoosePhotoFromLibrary}
+                  style={{ margin: 'auto' }}
+                >
+                  <Text style={styles.link}>Or choose from library</Text>
+                </TouchableOpacity>
+              </View>
             </View>
-          </View>
 
-          {showNameInput && (
-            <>
-              <Text style={styles.inputLabel}>Name</Text>
-              <TextInput
-                autoCorrect={false}
-                style={styles.input}
-                placeholder='Name'
-                value={formData.name}
-                onChangeText={text => setFormData(formData => ({ ...formData, name: text }))}
-              />
-            </>
-          )}
-          {(selectedSpecies && !showSpeciesInput && (
-            <>
-              <Text style={styles.inputLabel}>Species</Text>
-              <SpeciesCard
-                species={selectedSpecies}
-                onClose={handleClearSpecies}
-              />
-              {mode === 'add' && (
-                <>
-                  <Text style={styles.inputLabel}>
-                    Fertilizer Recommendations
-                  </Text>
-                  <FertilizerRecommendations speciesId={selectedSpecies?._id} />
-                </>
-              )}
-            </>
-          )) || (
-            <>
-              <Text style={styles.inputLabel}>Species</Text>
-              <View style={{ position: 'relative' }}>
+            {showNameInput && (
+              <>
+                <Text style={styles.inputLabel}>Name</Text>
                 <TextInput
                   autoCorrect={false}
                   style={styles.input}
-                  placeholder='Search for species...'
-                  value={speciesSearchQuery}
-                  onChangeText={(text) => {
-                    setSpeciesSearchQuery(text)
-                    setShowSpeciesSuggestions(true)
-                  }}
-                  onFocus={() => setShowSpeciesSuggestions(true)}
-                  onBlur={handleSpeciesInputBlur}
+                  placeholder='Name'
+                  value={formData.name}
+                  onChangeText={text => setFormData(formData => ({ ...formData, name: text }))}
                 />
-                {(isLoadingSpecies || isLoadingIdentification) && (
-                  <View style={{
-                    position: 'absolute',
-                    right: 12,
-                    top: 0,
-                    bottom: 14,
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                  }}>
-                    <ActivityIndicator size="small" color={palette.textSecondary} />
-                  </View>
+
+                {(
+                  mode !== 'add' ||
+                  !!formData.speciesId
+                ) && (
+                  <>
+                    <Text style={styles.inputLabel}>Notes (optional)</Text>
+                    <TextInput
+                      style={[styles.input, styles.textArea]}
+                      placeholder='Notes (optional)'
+                      value={formData.notes}
+                      onChangeText={(text) => setFormData(formData => ({ ...formData, notes: text }))}
+                      multiline
+                      numberOfLines={3}
+                    />
+                  </>
                 )}
-                {showSpeciesSuggestions && speciesData?.species && speciesData.species.length > 0 && (
-                  <View
-                    style={{
-                      position: 'absolute',
-                      top: '100%',
-                      left: 0,
-                      right: 0,
-                      backgroundColor: palette.surface,
-                      borderWidth: 1,
-                      borderColor: palette.border,
-                      borderRadius: 14,
-                      marginTop: 4,
-                      maxHeight: 300,
-                      elevation: 10,
-                      shadowColor: '#000',
-                      shadowOffset: { width: 0, height: 2 },
-                      shadowOpacity: 0.25,
-                      shadowRadius: 3.84,
-                      zIndex: 1000,
+              </>
+            )}
+            {(selectedSpecies && !showSpeciesInput && (
+              <>
+                <Text style={styles.inputLabel}>Species</Text>
+                <SpeciesCard
+                  species={selectedSpecies}
+                  onClose={handleClearSpecies}
+                />
+                {mode === 'add' && (
+                  <>
+                    <Text style={styles.inputLabel}>
+                      Fertilizer Recommendations
+                    </Text>
+                    <FertilizerRecommendations speciesId={selectedSpecies?._id} />
+                  </>
+                )}
+              </>
+            )) || (
+              <>
+                <Text style={styles.inputLabel}>Species</Text>
+                <View style={{ position: 'relative' }}>
+                  <TextInput
+                    autoCorrect={false}
+                    style={styles.input}
+                    placeholder='Search for species...'
+                    value={speciesSearchQuery}
+                    onChangeText={(text) => {
+                      setSpeciesSearchQuery(text)
+                      setShowSpeciesSuggestions(true)
                     }}
-                  >
-                    <ScrollView
-                      nestedScrollEnabled
-                      onTouchEnd={(e) => {
-                        e.stopPropagation()
-                        e.preventDefault()
+                    onFocus={() => setShowSpeciesSuggestions(true)}
+                    onBlur={handleSpeciesInputBlur}
+                  />
+                  {(isLoadingSpecies || isLoadingIdentification) && (
+                    <View style={{
+                      position: 'absolute',
+                      right: 12,
+                      top: 0,
+                      bottom: 14,
+                      justifyContent: 'center',
+                      alignItems: 'center',
+                    }}>
+                      <ActivityIndicator size="small" color={palette.textSecondary} />
+                    </View>
+                  )}
+                  {showSpeciesSuggestions && speciesData?.species && speciesData.species.length > 0 && (
+                    <View
+                      style={{
+                        position: 'absolute',
+                        top: '100%',
+                        left: 0,
+                        right: 0,
+                        backgroundColor: palette.surface,
+                        borderWidth: 1,
+                        borderColor: palette.border,
+                        borderRadius: 14,
+                        marginTop: 4,
+                        maxHeight: 300,
+                        elevation: 10,
+                        shadowColor: '#000',
+                        shadowOffset: { width: 0, height: 2 },
+                        shadowOpacity: 0.25,
+                        shadowRadius: 3.84,
+                        zIndex: 1000,
                       }}
                     >
-                      {speciesData.species.map((item) => (
-                        <TouchableOpacity
-                          key={item._id}
-                          style={{
-                            flexDirection: 'row',
-                            padding: 12,
-                            borderBottomWidth: 1,
-                            borderBottomColor: palette.border,
-                            alignItems: 'center',
-                          }}
-                          onPress={() => handleSpeciesSelect(item)}
-                        >
-                          {item.imageUrl && (
-                            <Image
-                              source={{ uri: item.imageUrl }}
-                              style={{ width: 150, height: 150, borderRadius: 8, marginRight: 12 }}
-                              resizeMode='cover'
-                            />
-                          )}
-                          <View style={{ flex: 1 }}>
-                            <Text style={[styles.listItemTitle, { marginBottom: 4 }]}>{item.commonName}</Text>
-                            {item.scientificName && (
-                              <Text style={[styles.listItemText, { fontSize: 12, marginBottom: 2 }]}>{item.scientificName}</Text>
-                            )}
-                            {(item.family || item.genus) && (
-                              <Text style={[styles.listItemText, { fontSize: 12, color: palette.textSecondary }]}>
-                                {[item.genus, item.family].filter(Boolean).join(' • ')}
-                              </Text>
+                      <ScrollView
+                        nestedScrollEnabled
+                        onTouchEnd={(e) => {
+                          e.stopPropagation()
+                          e.preventDefault()
+                        }}
+                      >
+                        {speciesData.species.map((item) => (
+                          <TouchableOpacity
+                            key={item._id}
+                            style={{
+                              flexDirection: 'row',
+                              padding: 12,
+                              borderBottomWidth: 1,
+                              borderBottomColor: palette.border,
+                              alignItems: 'center',
+                            }}
+                            onPress={() => handleSpeciesSelect(item)}
+                          >
+                            {item.imageUrl && (
+                              <Image
+                                source={{ uri: item.imageUrl }}
+                                style={{ width: 150, height: 150, borderRadius: 8, marginRight: 12 }}
+                                resizeMode='cover'
+                              />
                             )}
-                          </View>
-                        </TouchableOpacity>
-                      ))}
-                    </ScrollView>
-                  </View>
-                )}
-              </View>
-            </>
-          )}
+                            <View style={{ flex: 1 }}>
+                              <Text style={[styles.listItemTitle, { marginBottom: 4 }]}>{item.commonName}</Text>
+                              {item.scientificName && (
+                                <Text style={[styles.listItemText, { fontSize: 12, marginBottom: 2 }]}>{item.scientificName}</Text>
+                              )}
+                              {(item.family || item.genus) && (
+                                <Text style={[styles.listItemText, { fontSize: 12, color: palette.textSecondary }]}>
+                                  {[item.genus, item.family].filter(Boolean).join(' • ')}
+                                </Text>
+                              )}
+                            </View>
+                          </TouchableOpacity>
+                        ))}
+                      </ScrollView>
+                    </View>
+                  )}
+                </View>
+              </>
+            )}
 
-          <Text style={styles.inputLabel}>Planted On</Text>
-          <DateTimePicker
-            mode='date'
-            onChange={({ selectedDate }) => {
-              if (selectedDate) {
-                setFormData(formData => ({ ...formData, plantedAt: selectedDate }))
-              }
-            }}
-            setShowPicker={setShowPlantedAtDatePicker}
-            showPicker={showPlantedAtDatePicker}
-            value={formData.plantedAt}
-          />
-
-          <Text style={styles.inputLabel}>Current Lifecycle</Text>
-          <SegmentedControl
-            options={['Start', 'Veg', 'Bloom', 'Fruiting']}
-            selectedValue={formData.lifecycle ? (formData.lifecycle.charAt(0).toUpperCase() + formData.lifecycle.slice(1)) : 'Start'}
-            onValueChange={(value) => setFormData(formData => ({ ...formData, lifecycle: value.toLowerCase() as PlantLifecycle }))}
-            icons={{
-              'Start': LIFECYCLE_ICONS.start,
-              'Veg': LIFECYCLE_ICONS.veg,
-              'Bloom': LIFECYCLE_ICONS.bloom,
-              'Fruiting': LIFECYCLE_ICONS.fruiting,
-            }}
-          />
-
-          <Text style={styles.inputLabel}>Notes (optional)</Text>
-          <TextInput
-            style={[styles.input, styles.textArea]}
-            placeholder='Notes (optional)'
-            value={formData.notes}
-            onChangeText={(text) => setFormData(formData => ({ ...formData, notes: text }))}
-            multiline
-            numberOfLines={3}
-          />
-
-          {mutation.error && (
-            <Text style={styles.errorText}>
-              Error: {mutation.error.message}
-            </Text>
-          )}
+            <Text style={styles.inputLabel}>Planted On</Text>
+            <DateTimePicker
+              mode='date'
+              onChange={({ selectedDate }) => {
+                if (selectedDate) {
+                  setFormData(formData => ({ ...formData, plantedAt: selectedDate }))
+                }
+              }}
+              setShowPicker={setShowPlantedAtDatePicker}
+              showPicker={showPlantedAtDatePicker}
+              value={formData.plantedAt}
+            />
 
-          <TouchableOpacity
-            style={[styles.submitButton, mutation.isPending && styles.submitButtonDisabled]}
-            onPress={handleSubmit}
-            disabled={mutation.isPending}
-          >
-            <Text style={styles.buttonText}>
-              {mutation.isPending ? 'Saving...' : 'Save'}
-            </Text>
-          </TouchableOpacity>
-          <TouchableOpacity
-            style={[styles.cancelButton, mutation.isPending && styles.submitButtonDisabled]}
-            onPress={() => router.back()}
-            disabled={mutation.isPending}
-          >
-            <Text style={styles.buttonText}>
-              Cancel
-            </Text>
-          </TouchableOpacity>
-        </ScrollView>
+            <Text style={styles.inputLabel}>Current Lifecycle</Text>
+            <SegmentedControl
+              options={['Start', 'Veg', 'Bloom', 'Fruiting']}
+              selectedValue={formData.lifecycle ? (formData.lifecycle.charAt(0).toUpperCase() + formData.lifecycle.slice(1)) : 'Start'}
+              onValueChange={(value) => setFormData(formData => ({ ...formData, lifecycle: value.toLowerCase() as PlantLifecycle }))}
+              icons={{
+                'Start': LIFECYCLE_ICONS.start,
+                'Veg': LIFECYCLE_ICONS.veg,
+                'Bloom': LIFECYCLE_ICONS.bloom,
+                'Fruiting': LIFECYCLE_ICONS.fruiting,
+              }}
+            />
+
+            {mutation.error && (
+              <Text style={styles.errorText}>
+                Error: {mutation.error.message}
+              </Text>
+            )}
+
+            <TouchableOpacity
+              style={[styles.submitButton, mutation.isPending && styles.submitButtonDisabled]}
+              onPress={handleSubmit}
+              disabled={mutation.isPending}
+            >
+              <Text style={styles.buttonText}>
+                {mutation.isPending ? 'Saving...' : 'Save'}
+              </Text>
+            </TouchableOpacity>
+            <TouchableOpacity
+              style={[styles.cancelButton, mutation.isPending && styles.submitButtonDisabled]}
+              onPress={() => router.back()}
+              disabled={mutation.isPending}
+            >
+              <Text style={styles.buttonText}>
+                Cancel
+              </Text>
+            </TouchableOpacity>
+          </ScrollView>
+        </KeyboardAvoidingView>
       )}
 
       <Modal
diff --git a/apps/mobile/src/components/AddEditChoreModal.tsx b/apps/mobile/src/components/AddEditChoreModal.tsx
index d33cfce..d919aea 100644
--- a/apps/mobile/src/components/AddEditChoreModal.tsx
+++ b/apps/mobile/src/components/AddEditChoreModal.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Modal, ScrollView, Text, TouchableOpacity, View } from 'react-native'
+import { KeyboardAvoidingView, Modal, Platform, ScrollView, Text, TouchableOpacity, View } from 'react-native'
 
 import { PickerSchedule } from './PickerSchedule'
 import { TextInput } from './TextInput'
@@ -50,7 +50,11 @@ export function AddEditChoreModal({
       presentationStyle="fullScreen"
       onRequestClose={onClose}
     >
-      <View style={{ flex: 1, backgroundColor: palette.background }}>
+      <KeyboardAvoidingView
+        style={{ flex: 1, backgroundColor: palette.background }}
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
+      >
         <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', padding: 20, paddingTop: 60, borderBottomWidth: 1, borderBottomColor: palette.border, backgroundColor: palette.surface }}>
           <Text style={styles.formTitle}>
             {mode === 'add' ? 'Add New Chore' : 'Edit Chore'}
@@ -59,7 +63,11 @@ export function AddEditChoreModal({
             <Text style={{ fontSize: 24, color: palette.textPrimary }}>✕</Text>
           </TouchableOpacity>
         </View>
-        <ScrollView style={[styles.formContainer, { flex: 1 }]}>
+        <ScrollView
+          style={[styles.formContainer, { flex: 1 }]}
+          keyboardShouldPersistTaps="handled"
+          contentContainerStyle={{ paddingBottom: 24 }}
+        >
           <Text style={styles.inputLabel}>Fertilizers</Text>
           {formData.fertilizers.map((fert, index) => (
             <View key={index} style={{ marginBottom: 12, borderWidth: 1, borderColor: '#ddd', padding: 12, borderRadius: 8 }}>
@@ -131,6 +139,16 @@ export function AddEditChoreModal({
             onChangeText={(text) => onChange({ ...formData, description: text })}
           />
 
+          <Text style={styles.inputLabel}>Notes (optional)</Text>
+          <TextInput
+            style={[styles.input, styles.textArea]}
+            placeholder="Notes (optional)"
+            value={formData.notes}
+            onChangeText={(text) => onChange({ ...formData, notes: text })}
+            multiline
+            numberOfLines={3}
+          />
+
           <Text style={styles.inputLabel}>Repeat</Text>
           <PickerSchedule
             left={{
@@ -189,16 +207,6 @@ export function AddEditChoreModal({
             })}
           </ScrollView>
 
-          <Text style={styles.inputLabel}>Notes (optional)</Text>
-          <TextInput
-            style={[styles.input, styles.textArea]}
-            placeholder="Notes (optional)"
-            value={formData.notes}
-            onChangeText={(text) => onChange({ ...formData, notes: text })}
-            multiline
-            numberOfLines={3}
-          />
-
           {mutation.error && (
             <Text style={styles.errorText}>
               Error: {mutation.error.message}
@@ -222,7 +230,7 @@ export function AddEditChoreModal({
             <Text style={styles.buttonText}>Cancel</Text>
           </TouchableOpacity>
         </ScrollView>
-      </View>
+      </KeyboardAvoidingView>
     </Modal>
   )
 }
diff --git a/apps/mobile/src/components/InputError.tsx b/apps/mobile/src/components/InputError.tsx
index 8b1e9c0..3e3c077 100644
--- a/apps/mobile/src/components/InputError.tsx
+++ b/apps/mobile/src/components/InputError.tsx
@@ -1,13 +1,15 @@
 import React from 'react'
-import { StyleSheet, Text, TextProps } from 'react-native'
+import { StyleSheet, Text, type TextProps } from 'react-native'
 
 import { styles } from '../styles'
 
-export const InputError = ({ error, ...props }: TextProps & { error?: string }) => {
+export type InputErrorProps = TextProps & { error?: string }
+
+export const InputError = ({ error, style,...props }: InputErrorProps) => {
   return (
     <Text
       {...props}
-      style={[styles.errorText, localStyles.errorText]}
+      style={[styles.errorText, localStyles.errorText, style]}
     >
       {error}
     </Text>
diff --git a/apps/mobile/src/components/TextInput.tsx b/apps/mobile/src/components/TextInput.tsx
index 8bb8587..a8c9ed7 100644
--- a/apps/mobile/src/components/TextInput.tsx
+++ b/apps/mobile/src/components/TextInput.tsx
@@ -1,24 +1,55 @@
 import React from 'react'
-import { type StyleProp, StyleSheet, TextInput as RNTextInput, TextInputProps as RNTextInputProps, View, type ViewStyle } from 'react-native'
+import { StyleSheet, TextInput as RNTextInput, type TextInputProps as RNTextInputProps, View, type StyleProp, type TextStyle, type ViewStyle } from 'react-native'
 
-import type { TrpcRouter } from '../trpc'
+import { TrpcRouter } from '@plannting/api/dist/routers/trpc'
 
 import { InputError } from './InputError'
 
 export type TextInputProps = RNTextInputProps & {
-  containerStyle?: StyleProp<ViewStyle>
+  containerStyle?: StyleProp<ViewStyle>,
+  errorStyle?: StyleProp<TextStyle>,
   fieldError?: NonNullable<ReturnType<TrpcRouter['_def']['_config']['errorFormatter']>['data']['fieldErrors']>[number],
 }
 
-export const TextInput = ({ fieldError, ...props }: TextInputProps) => {
+export const TextInput = ({
+  containerStyle,
+  errorStyle,
+  fieldError,
+  ...props
+}: TextInputProps) => {
+  const [isFocused, setIsFocused] = React.useState(false)
+
+  const isMultiline = !!props.multiline
+
+  // For multiline inputs, keep scrollEnabled=false when not focused,
+  // and true when focused so content can scroll above the keyboard.
+  const resolvedScrollEnabled = isMultiline
+    ? (props.scrollEnabled ?? isFocused)
+    : props.scrollEnabled
+
   return (
-    <View style={[localStyles.container, props.containerStyle]}>
+    <View style={[localStyles.container, containerStyle]}>
       <RNTextInput
         {...props}
         style={[localStyles.input, props.style]}
+        scrollEnabled={resolvedScrollEnabled}
+        onFocus={(event) => {
+          if (isMultiline) {
+            setIsFocused(true)
+          }
+
+          props.onFocus?.(event)
+        }}
+        onBlur={(event) => {
+          if (isMultiline) {
+            setIsFocused(false)
+          }
+
+          props.onBlur?.(event)
+        }}
       />
 
-      {fieldError && <InputError error={fieldError.message} />}
+      {fieldError && <InputError error={fieldError.message} style={errorStyle} />}
     </View>
   )
 }