diff --git a/app/components/file_upload_preview/file_upload_preview.js b/app/components/file_upload_preview/file_upload_preview.js
index 246c9bf04..ef5fd1b00 100644
--- a/app/components/file_upload_preview/file_upload_preview.js
+++ b/app/components/file_upload_preview/file_upload_preview.js
@@ -14,7 +14,6 @@ import Icon from 'react-native-vector-icons/Ionicons';
 
 import FileAttachmentImage from 'app/components/file_attachment_list/file_attachment_image';
 import FileAttachmentIcon from 'app/components/file_attachment_list/file_attachment_icon';
-import KeyboardLayout from 'app/components/layout/keyboard_layout';
 
 export default class FileUploadPreview extends PureComponent {
     static propTypes = {
@@ -104,7 +103,7 @@ export default class FileUploadPreview extends PureComponent {
         }
 
         return (
-            <KeyboardLayout>
+            <View>
                 <View style={[style.container, {height: this.props.deviceHeight}]}>
                     <ScrollView
                         horizontal={true}
@@ -114,7 +113,7 @@ export default class FileUploadPreview extends PureComponent {
                         {this.buildFilePreviews()}
                     </ScrollView>
                 </View>
-            </KeyboardLayout>
+            </View>
         );
     }
 }
diff --git a/app/screens/channel/channel.js b/app/screens/channel/channel.js
index 6461f1fcf..6465fdf4c 100644
--- a/app/screens/channel/channel.js
+++ b/app/screens/channel/channel.js
@@ -208,7 +208,7 @@ class Channel extends PureComponent {
                         navigator={navigator}
                         onPress={this.goToChannelInfo}
                     />
-                    <KeyboardLayout behavior='padding'>
+                    <KeyboardLayout>
                         <View style={style.postList}>
                             <ChannelPostList navigator={navigator}/>
                         </View>
diff --git a/app/screens/edit_post/edit_post.js b/app/screens/edit_post/edit_post.js
index 51ec65d8e..5580fbf40 100644
--- a/app/screens/edit_post/edit_post.js
+++ b/app/screens/edit_post/edit_post.js
@@ -10,7 +10,6 @@ import {
 } from 'react-native';
 
 import ErrorText from 'app/components/error_text';
-import KeyboardLayout from 'app/components/layout/keyboard_layout';
 import Loading from 'app/components/loading';
 import StatusBar from 'app/components/status_bar';
 import TextInputWithLocalizedPlaceholder from 'app/components/text_input_with_localized_placeholder';
@@ -181,11 +180,7 @@ class EditPost extends PureComponent {
         }
 
         return (
-            <KeyboardLayout
-                behavior='padding'
-                style={style.container}
-                keyboardVerticalOffset={0}
-            >
+            <View style={style.container}>
                 <StatusBar/>
                 <View style={style.scrollView}>
                     {displayError}
@@ -207,7 +202,7 @@ class EditPost extends PureComponent {
                         />
                     </View>
                 </View>
-            </KeyboardLayout>
+            </View>
         );
     }
 }