diff --git a/app/components/custom_section_list.js b/app/components/custom_section_list.js
index d28f9f565..7d20170e6 100644
--- a/app/components/custom_section_list.js
+++ b/app/components/custom_section_list.js
@@ -248,6 +248,7 @@ export default class CustomSectionList extends React.PureComponent {
                 sections={this.state.sections}
                 keyExtractor={this.props.keyExtractor}
                 renderItem={this.renderItem}
+                keyboardShouldPersistTaps='handled'
             />
         );
     }
diff --git a/app/components/file_attachment_list/file_attachment_list.js b/app/components/file_attachment_list/file_attachment_list.js
index f00f772ee..15e54f19f 100644
--- a/app/components/file_attachment_list/file_attachment_list.js
+++ b/app/components/file_attachment_list/file_attachment_list.js
@@ -4,6 +4,7 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import {
+    Keyboard,
     View,
     TouchableOpacity
 } from 'react-native';
@@ -69,6 +70,7 @@ export default class FileAttachmentList extends Component {
 
     handlePreviewPress = (file) => {
         this.props.hideOptionsContext();
+        Keyboard.dismiss();
         preventDoubleTap(this.goToImagePreview, this, this.props.postId, file.id);
     };
 
diff --git a/app/components/post_list/post_list.js b/app/components/post_list/post_list.js
index 3972e49fe..2ac13bf48 100644
--- a/app/components/post_list/post_list.js
+++ b/app/components/post_list/post_list.js
@@ -176,6 +176,7 @@ export default class PostList extends PureComponent {
                 {...refreshControl}
                 renderItem={this.renderItem}
                 theme={theme}
+                keyboardShouldPersistTaps='handled'
             />
         );
     }