diff --git a/BlueComponents.js b/BlueComponents.js
index a892c77fa..17320ab36 100644
--- a/BlueComponents.js
+++ b/BlueComponents.js
@@ -2292,7 +2292,6 @@ export class BlueReplaceFeeSuggestions extends Component {
   };
 
   state = {
-    selectedFeeType: NetworkTransactionFeeType.FAST,
     customFeeValue: '1',
   };
 
@@ -2301,11 +2300,11 @@ export class BlueReplaceFeeSuggestions extends Component {
       const cachedNetworkTransactionFees = JSON.parse(await AsyncStorage.getItem(NetworkTransactionFee.StorageKey));
 
       if (cachedNetworkTransactionFees && 'fastestFee' in cachedNetworkTransactionFees) {
-        this.setState({ networkFees: cachedNetworkTransactionFees });
+        this.setState({ networkFees: cachedNetworkTransactionFees }, () => this.onFeeSelected(NetworkTransactionFeeType.FAST));
       }
     } catch (_) {}
     const networkFees = await NetworkTransactionFees.recommendedFees();
-    this.setState({ networkFees });
+    this.setState({ networkFees }, () => this.onFeeSelected(NetworkTransactionFeeType.FAST));
   }
 
   onFeeSelected = selectedFeeType => {
diff --git a/screen/transactions/CPFP.js b/screen/transactions/CPFP.js
index 3be5ac142..2455d4fda 100644
--- a/screen/transactions/CPFP.js
+++ b/screen/transactions/CPFP.js
@@ -1,7 +1,7 @@
 /* global alert */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { ActivityIndicator, View, TextInput, TouchableOpacity, Linking, ScrollView, StyleSheet } from 'react-native';
+import { ActivityIndicator, View, TextInput, TouchableOpacity, Linking, ScrollView, StyleSheet, KeyboardAvoidingView } from 'react-native';
 import Clipboard from '@react-native-community/clipboard';
 import { Text } from 'react-native-elements';
 import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
@@ -167,20 +167,22 @@ export default class CPFP extends Component {
 
   renderStage1(text) {
     return (
-      <SafeBlueArea style={styles.root}>
-        <BlueSpacing />
-        <BlueCard style={styles.center}>
-          <BlueText>{text}</BlueText>
-          <BlueSpacing20 />
-          <BlueReplaceFeeSuggestions onFeeSelected={fee => this.setState({ newFeeRate: fee })} transactionMinimum={this.state.feeRate} />
+      <KeyboardAvoidingView behavior="position">
+        <SafeBlueArea style={styles.root}>
           <BlueSpacing />
-          <BlueButton
-            disabled={this.state.newFeeRate <= this.state.feeRate}
-            onPress={() => this.createTransaction()}
-            title={loc.transactions.cpfp_create}
-          />
-        </BlueCard>
-      </SafeBlueArea>
+          <BlueCard style={styles.center}>
+            <BlueText>{text}</BlueText>
+            <BlueSpacing20 />
+            <BlueReplaceFeeSuggestions onFeeSelected={fee => this.setState({ newFeeRate: fee })} transactionMinimum={this.state.feeRate} />
+            <BlueSpacing />
+            <BlueButton
+              disabled={this.state.newFeeRate <= this.state.feeRate}
+              onPress={() => this.createTransaction()}
+              title={loc.transactions.cpfp_create}
+            />
+          </BlueCard>
+        </SafeBlueArea>
+      </KeyboardAvoidingView>
     );
   }