diff --git a/app/containers/Routes.js b/app/containers/Routes.js
index 4c8a82c17..b62f1443a 100644
--- a/app/containers/Routes.js
+++ b/app/containers/Routes.js
@@ -30,6 +30,12 @@ export default class Routes extends React.Component {
 		return !this.props.app.ready && this.props.appInit();
 	}
 
+	componentDidMount() {
+		if (!this.props.app.starting) {
+			SplashScreen.hide();
+		}
+	}
+
 	componentWillReceiveProps(nextProps) {
 		if (!nextProps.app.starting && this.props.app.starting !== nextProps.app.starting) {
 			SplashScreen.hide();
diff --git a/app/views/LoginView.js b/app/views/LoginView.js
index f1f213ca8..c3d8b4e71 100644
--- a/app/views/LoginView.js
+++ b/app/views/LoginView.js
@@ -88,7 +88,11 @@ class LoginView extends React.Component {
 				contentContainerStyle={styles.container}
 				keyboardVerticalOffset={128}
 			>
-				<ScrollView style={styles.loginView}>
+				<ScrollView
+					style={styles.loginView}
+					keyboardDismissMode='interactive'
+					keyboardShouldPersistTaps='always'
+				>
 					<SafeAreaView>
 						<View style={styles.formContainer}>
 							<TextInput