diff --git a/app/views/RoomView.js b/app/views/RoomView.js
index 5fc9652fb..acf6e53e5 100644
--- a/app/views/RoomView.js
+++ b/app/views/RoomView.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Text, View, StyleSheet, Button } from 'react-native';
+import { Text, View, StyleSheet, Button, SafeAreaView } from 'react-native';
 import { ListView } from 'realm/react-native';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -19,6 +19,9 @@ const styles = StyleSheet.create({
 		flex: 1,
 		backgroundColor: '#fff'
 	},
+	safeAreaView: {
+		flex: 1
+	},
 	list: {
 		flex: 1,
 		transform: [{ scaleY: -1 }]
@@ -193,18 +196,20 @@ export default class RoomView extends React.Component {
 
 	render() {
 		return (
-			<KeyboardView style={styles.container} keyboardVerticalOffset={64}>
+			<KeyboardView contentContainerStyle={styles.container} keyboardVerticalOffset={64}>
 				{this.renderBanner()}
-				<ListView
-					enableEmptySections
-					style={styles.list}
-					onEndReachedThreshold={10}
-					renderFooter={this.renderHeader}
-					onEndReached={this.onEndReached}
-					dataSource={this.state.dataSource}
-					renderRow={item => this.renderItem({ item })}
-					initialListSize={10}
-				/>
+				<SafeAreaView style={styles.safeAreaView}>
+					<ListView
+						enableEmptySections
+						style={styles.list}
+						onEndReachedThreshold={10}
+						renderFooter={this.renderHeader}
+						onEndReached={this.onEndReached}
+						dataSource={this.state.dataSource}
+						renderRow={item => this.renderItem({ item })}
+						initialListSize={10}
+					/>
+				</SafeAreaView>
 				{this.renderFooter()}
 			</KeyboardView>
 		);