diff --git a/src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx b/src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx
index 5d15a74895..cdac376960 100644
--- a/src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx
+++ b/src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.stories.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 import {SelectedWalletProvider} from '../../../../SelectedWallet'
 import {mocks} from '../../../../yoroi-wallets/mocks/wallet'
 import {SendProvider} from '../../../shared/SendContext'
-import {SelectTokenFromListScreen} from './SelectTokenScreen'
+import {SelectTokenFromListScreen} from './SelectTokenFromListScreen'
 
 storiesOf('Send/SelectTokenFromList', module).add('Default', () => {
   return (
diff --git a/src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenScreen.tsx b/src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.tsx
similarity index 100%
rename from src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenScreen.tsx
rename to src/Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen.tsx
diff --git a/src/Send/useCases/StartTx/StartTxScreen.tsx b/src/Send/useCases/StartTx/StartTxScreen.tsx
index fde689f1ca..e74a90b7ff 100644
--- a/src/Send/useCases/StartTx/StartTxScreen.tsx
+++ b/src/Send/useCases/StartTx/StartTxScreen.tsx
@@ -1,7 +1,7 @@
 import {useNavigation} from '@react-navigation/native'
 import _ from 'lodash'
 import React from 'react'
-import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'
+import {KeyboardAvoidingView, Platform, ScrollView, StyleSheet, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Button, Spacer} from '../../../components'
@@ -49,35 +49,39 @@ export const StartTxScreen = () => {
 
   return (
     <SafeAreaView edges={['left', 'right']} style={styles.container}>
-      <ShowErrors />
-
-      <Spacer height={16} />
-
-      <ScrollView keyboardDismissMode="on-drag" keyboardShouldPersistTaps="never">
-        <ResolveAddress
-          onChangeReceiver={receiverChanged}
-          receiver={receiver}
-          address={address}
-          errorMessage={addressErrorMessage}
-          isLoading={isLoading}
-        />
-
-        <Spacer height={16} />
-
-        <InputMemo memo={memo} onChangeText={memoChanged} />
-      </ScrollView>
-
-      <Spacer fill />
-
-      <Actions>
-        <NextButton
-          onPress={onNext}
-          title={strings.next}
-          disabled={!isValid || isLoading}
-          testID="nextButton"
-          shelleyTheme
-        />
-      </Actions>
+      <KeyboardAvoidingView
+        style={styles.flex}
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        keyboardVerticalOffset={90}
+      >
+        <ScrollView style={styles.flex} keyboardDismissMode="on-drag" keyboardShouldPersistTaps="never">
+          <ShowErrors />
+
+          <Spacer height={16} />
+
+          <ResolveAddress
+            onChangeReceiver={receiverChanged}
+            receiver={receiver}
+            address={address}
+            errorMessage={addressErrorMessage}
+            isLoading={isLoading}
+          />
+
+          <Spacer height={16} />
+
+          <InputMemo memo={memo} onChangeText={memoChanged} />
+        </ScrollView>
+
+        <Actions>
+          <NextButton
+            onPress={onNext}
+            title={strings.next}
+            disabled={!isValid || isLoading}
+            testID="nextButton"
+            shelleyTheme
+          />
+        </Actions>
+      </KeyboardAvoidingView>
     </SafeAreaView>
   )
 }
@@ -99,6 +103,9 @@ const styles = StyleSheet.create({
     backgroundColor: COLORS.WHITE,
     paddingHorizontal: 16,
   },
+  flex: {
+    flex: 1,
+  },
   actions: {
     paddingVertical: 16,
   },
diff --git a/src/TxHistory/TxHistoryNavigator.tsx b/src/TxHistory/TxHistoryNavigator.tsx
index 62e0ca7aa8..696724636d 100644
--- a/src/TxHistory/TxHistoryNavigator.tsx
+++ b/src/TxHistory/TxHistoryNavigator.tsx
@@ -14,7 +14,7 @@ import {ReceiveScreen} from '../Receive/ReceiveScreen'
 import {useSelectedWallet} from '../SelectedWallet'
 import {SendProvider} from '../Send/shared/SendContext'
 import {ConfirmTxScreen} from '../Send/useCases/ConfirmTx'
-import {SelectTokenFromListScreen} from '../Send/useCases/ListSelectedTokens/AddToken/SelectTokenScreen'
+import {SelectTokenFromListScreen} from '../Send/useCases/ListSelectedTokens/AddToken/SelectTokenFromListScreen'
 import {EditAmountScreen} from '../Send/useCases/ListSelectedTokens/EditAmountScreen'
 import {ListSelectedTokensScreen} from '../Send/useCases/ListSelectedTokens/ListSelectedTokensScreen'
 import {ReadQRCodeScreen} from '../Send/useCases/StartTx/InputReceiver/ReadQRCodeScreen'