diff --git a/app/components/autocomplete/autocomplete.js b/app/components/autocomplete/autocomplete.js
index 30255b3d3..c05ca56a5 100644
--- a/app/components/autocomplete/autocomplete.js
+++ b/app/components/autocomplete/autocomplete.js
@@ -7,6 +7,7 @@ import {
     Keyboard,
     Platform,
     View,
+    ViewPropTypes,
 } from 'react-native';
 
 import EventEmitter from '@mm-redux/utils/event_emitter';
@@ -37,6 +38,7 @@ export default class Autocomplete extends PureComponent {
         nestedScrollEnabled: PropTypes.bool,
         expandDown: PropTypes.bool,
         onVisible: PropTypes.func,
+        style: ViewPropTypes.style,
     };
 
     static defaultProps = {
@@ -194,6 +196,10 @@ export default class Autocomplete extends PureComponent {
             }
         }
 
+        if (this.props.style) {
+            containerStyles.push(this.props.style);
+        }
+
         const maxListHeight = this.maxListHeight();
 
         return (
diff --git a/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap b/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
index f277ee24c..81e7c8d8d 100644
--- a/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
+++ b/app/components/autocomplete/emoji_suggestion/__snapshots__/emoji_suggestion.test.js.snap
@@ -1,45 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`components/autocomplete/emoji_suggestion should match snapshot 1`] = `
-<FlatList
-  ItemSeparatorComponent={[Function]}
-  data={Array []}
-  disableVirtualization={false}
-  extraData={
-    Object {
-      "active": false,
-      "dataSource": Array [],
-    }
-  }
-  horizontal={false}
-  initialListSize={10}
-  initialNumToRender={10}
-  keyExtractor={[Function]}
-  keyboardShouldPersistTaps="always"
-  maxToRenderPerBatch={10}
-  nestedScrollEnabled={false}
-  numColumns={1}
-  onEndReachedThreshold={2}
-  pageSize={10}
-  removeClippedSubviews={false}
-  renderItem={[Function]}
-  scrollEventThrottle={50}
-  style={
-    Array [
-      Object {
-        "backgroundColor": "#ffffff",
-        "flex": 1,
-      },
-      Object {
-        "height": 0,
-        "maxHeight": undefined,
-      },
-    ]
-  }
-  updateCellsBatchingPeriod={50}
-  windowSize={21}
-/>
-`;
+exports[`components/autocomplete/emoji_suggestion should match snapshot 1`] = `null`;
 
 exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
 <FlatList
@@ -3083,10 +3044,8 @@ exports[`components/autocomplete/emoji_suggestion should match snapshot 2`] = `
     Array [
       Object {
         "backgroundColor": "#ffffff",
-        "flex": 1,
       },
       Object {
-        "height": undefined,
         "maxHeight": undefined,
       },
     ]
diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
index bfb73b007..34430b781 100644
--- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
+++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
@@ -65,7 +65,6 @@ export default class EmojiSuggestion extends PureComponent {
         super(props);
 
         this.matchTerm = '';
-        this.listRef = React.createRef();
         fuse = new Fuse(props.emojis, FUSE_OPTIONS);
     }
 
@@ -216,23 +215,16 @@ export default class EmojiSuggestion extends PureComponent {
     render() {
         const {maxListHeight, theme, nestedScrollEnabled} = this.props;
 
-        let height;
         if (!this.state.active) {
-            // If we are not in an active state set a height of 0 so nothing is rendered
-            // and other components are not blocked.
-            height = 0;
-            if (this.listRef.current) {
-                this.listRef.current.scrollToOffset({offset: 0});
-            }
+            return null;
         }
 
         const style = getStyleFromTheme(theme);
 
         return (
             <FlatList
-                ref={this.listRef}
                 keyboardShouldPersistTaps='always'
-                style={[style.listView, {maxHeight: maxListHeight, height}]}
+                style={[style.listView, {maxHeight: maxListHeight}]}
                 extraData={this.state}
                 data={this.state.dataSource}
                 keyExtractor={this.keyExtractor}
@@ -260,7 +252,6 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             fontWeight: 'bold',
         },
         listView: {
-            flex: 1,
             backgroundColor: theme.centerChannelBg,
         },
         row: {
diff --git a/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap b/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap
index e5b7a5aad..50271d397 100644
--- a/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap
+++ b/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap
@@ -283,14 +283,6 @@ exports[`EditChannelInfo should match snapshot 1`] = `
             value="header"
           />
         </View>
-        <Connect(Autocomplete)
-          cursorPosition={6}
-          expandDown={true}
-          maxHeight={200}
-          nestedScrollEnabled={true}
-          onChangeText={[Function]}
-          value="header"
-        />
         <View
           style={
             Object {
@@ -319,5 +311,25 @@ exports[`EditChannelInfo should match snapshot 1`] = `
       </View>
     </TouchableWithoutFeedback>
   </KeyboardAwareScrollView>
+  <KeyboardTrackingView
+    style={
+      Object {
+        "justifyContent": "flex-end",
+      }
+    }
+  >
+    <Connect(Autocomplete)
+      cursorPosition={6}
+      maxHeight={200}
+      nestedScrollEnabled={true}
+      onChangeText={[Function]}
+      style={
+        Object {
+          "position": undefined,
+        }
+      }
+      value="header"
+    />
+  </KeyboardTrackingView>
 </React.Fragment>
 `;
diff --git a/app/components/edit_channel_info/edit_channel_info.js b/app/components/edit_channel_info/edit_channel_info.js
index 7a6796812..7dc1144b8 100644
--- a/app/components/edit_channel_info/edit_channel_info.js
+++ b/app/components/edit_channel_info/edit_channel_info.js
@@ -9,6 +9,7 @@ import {
     View,
 } from 'react-native';
 import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view';
+import {KeyboardTrackingView} from 'react-native-keyboard-tracking-view';
 
 import {General} from '@mm-redux/constants';
 
@@ -228,7 +229,7 @@ export default class EditChannelInfo extends PureComponent {
         }
 
         return (
-            <React.Fragment>
+            <>
                 <StatusBar/>
                 <KeyboardAwareScrollView
                     ref={this.scroll}
@@ -343,14 +344,6 @@ export default class EditChannelInfo extends PureComponent {
                                     keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
                                 />
                             </View>
-                            <Autocomplete
-                                cursorPosition={header.length}
-                                maxHeight={200}
-                                onChangeText={this.onHeaderChangeText}
-                                value={header}
-                                nestedScrollEnabled={true}
-                                expandDown={true}
-                            />
                             <View style={style.headerHelpText}>
                                 <FormattedText
                                     style={[style.helpText, padding(isLandscape)]}
@@ -361,13 +354,29 @@ export default class EditChannelInfo extends PureComponent {
                         </View>
                     </TouchableWithoutFeedback>
                 </KeyboardAwareScrollView>
-            </React.Fragment>
+                <KeyboardTrackingView style={style.autocompleteContainer}>
+                    <Autocomplete
+                        cursorPosition={header.length}
+                        maxHeight={200}
+                        onChangeText={this.onHeaderChangeText}
+                        value={header}
+                        nestedScrollEnabled={true}
+                        style={style.autocomplete}
+                    />
+                </KeyboardTrackingView>
+            </>
         );
     }
 }
 
 const getStyleSheet = makeStyleSheetFromTheme((theme) => {
     return {
+        autocomplete: {
+            position: undefined,
+        },
+        autocompleteContainer: {
+            justifyContent: 'flex-end',
+        },
         container: {
             flex: 1,
         },
diff --git a/app/screens/edit_post/__snapshots__/edit_post.test.js.snap b/app/screens/edit_post/__snapshots__/edit_post.test.js.snap
index 6ac60dc0b..51ce60621 100644
--- a/app/screens/edit_post/__snapshots__/edit_post.test.js.snap
+++ b/app/screens/edit_post/__snapshots__/edit_post.test.js.snap
@@ -1,71 +1,73 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EditPost should match snapshot 1`] = `
-<View
-  style={
-    Object {
-      "flex": 1,
-    }
-  }
->
-  <Connect(StatusBar) />
+<React.Fragment>
   <View
     style={
       Object {
-        "backgroundColor": "rgba(61,60,64,0.03)",
         "flex": 1,
       }
     }
   >
+    <Connect(StatusBar) />
     <View
       style={
-        Array [
-          Object {
-            "backgroundColor": "#ffffff",
-            "borderBottomColor": "rgba(61,60,64,0.1)",
-            "borderBottomWidth": 1,
-            "borderTopColor": "rgba(61,60,64,0.1)",
-            "borderTopWidth": 1,
-            "marginTop": 2,
-          },
-          null,
-          Object {
-            "height": NaN,
-          },
-        ]
+        Object {
+          "backgroundColor": "rgba(61,60,64,0.03)",
+          "flex": 1,
+        }
       }
     >
-      <TextInputWithLocalizedPlaceholder
-        blurOnSubmit={false}
-        disableFullscreenUI={true}
-        keyboardAppearance="light"
-        keyboardType="default"
-        multiline={true}
-        numberOfLines={10}
-        onChangeText={[Function]}
-        onSelectionChange={[Function]}
-        placeholder={
-          Object {
-            "defaultMessage": "Edit the post...",
-            "id": "edit_post.editPost",
-          }
-        }
-        placeholderTextColor="rgba(61,60,64,0.4)"
+      <View
         style={
           Array [
             Object {
-              "color": "#3d3c40",
-              "fontSize": 14,
-              "padding": 15,
-              "textAlignVertical": "top",
+              "backgroundColor": "#ffffff",
+              "borderBottomColor": "rgba(61,60,64,0.1)",
+              "borderBottomWidth": 1,
+              "borderTopColor": "rgba(61,60,64,0.1)",
+              "borderTopWidth": 1,
+              "marginTop": 2,
             },
+            null,
             Object {
               "height": NaN,
             },
           ]
         }
-        underlineColorAndroid="transparent"
-      />
+      >
+        <TextInputWithLocalizedPlaceholder
+          blurOnSubmit={false}
+          disableFullscreenUI={true}
+          keyboardAppearance="light"
+          keyboardType="default"
+          multiline={true}
+          numberOfLines={10}
+          onChangeText={[Function]}
+          onSelectionChange={[Function]}
+          placeholder={
+            Object {
+              "defaultMessage": "Edit the post...",
+              "id": "edit_post.editPost",
+            }
+          }
+          placeholderTextColor="rgba(61,60,64,0.4)"
+          style={
+            Array [
+              Object {
+                "color": "#3d3c40",
+                "fontSize": 14,
+                "padding": 15,
+                "textAlignVertical": "top",
+              },
+              Object {
+                "height": NaN,
+              },
+            ]
+          }
+          underlineColorAndroid="transparent"
+        />
+      </View>
     </View>
   </View>
   <KeyboardTrackingView
@@ -87,7 +89,12 @@ exports[`EditPost should match snapshot 1`] = `
       nestedScrollEnabled={true}
       onChangeText={[Function]}
       onVisible={[Function]}
+      style={
+        Object {
+          "position": undefined,
+        }
+      }
     />
   </KeyboardTrackingView>
-</View>
+</React.Fragment>
 `;
diff --git a/app/screens/edit_post/edit_post.js b/app/screens/edit_post/edit_post.js
index c857bb383..697451486 100644
--- a/app/screens/edit_post/edit_post.js
+++ b/app/screens/edit_post/edit_post.js
@@ -248,27 +248,29 @@ export default class EditPost extends PureComponent {
         ];
 
         return (
-            <View style={style.container}>
-                <StatusBar/>
-                <View style={style.scrollView}>
-                    {displayError}
-                    <View style={[inputContainerStyle, padding(isLandscape), {height}]}>
-                        <TextInputWithLocalizedPlaceholder
-                            ref={this.messageRef}
-                            value={message}
-                            blurOnSubmit={false}
-                            onChangeText={this.onPostChangeText}
-                            multiline={true}
-                            numberOfLines={10}
-                            style={[style.input, {height}]}
-                            placeholder={{id: t('edit_post.editPost'), defaultMessage: 'Edit the post...'}}
-                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.4)}
-                            underlineColorAndroid='transparent'
-                            disableFullscreenUI={true}
-                            keyboardAppearance={getKeyboardAppearanceFromTheme(this.props.theme)}
-                            onSelectionChange={this.handleOnSelectionChange}
-                            keyboardType={this.state.keyboardType}
-                        />
+            <>
+                <View style={style.container}>
+                    <StatusBar/>
+                    <View style={style.scrollView}>
+                        {displayError}
+                        <View style={[inputContainerStyle, padding(isLandscape), {height}]}>
+                            <TextInputWithLocalizedPlaceholder
+                                ref={this.messageRef}
+                                value={message}
+                                blurOnSubmit={false}
+                                onChangeText={this.onPostChangeText}
+                                multiline={true}
+                                numberOfLines={10}
+                                style={[style.input, {height}]}
+                                placeholder={{id: t('edit_post.editPost'), defaultMessage: 'Edit the post...'}}
+                                placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.4)}
+                                underlineColorAndroid='transparent'
+                                disableFullscreenUI={true}
+                                keyboardAppearance={getKeyboardAppearanceFromTheme(this.props.theme)}
+                                onSelectionChange={this.handleOnSelectionChange}
+                                keyboardType={this.state.keyboardType}
+                            />
+                        </View>
                     </View>
                 </View>
                 <KeyboardTrackingView style={autocompleteStyles}>
@@ -279,15 +281,19 @@ export default class EditPost extends PureComponent {
                         value={message}
                         nestedScrollEnabled={true}
                         onVisible={this.onAutocompleteVisible}
+                        style={style.autocomplete}
                     />
                 </KeyboardTrackingView>
-            </View>
+            </>
         );
     }
 }
 
 const getStyleSheet = makeStyleSheetFromTheme((theme) => {
     return {
+        autocomplete: {
+            position: undefined,
+        },
         container: {
             flex: 1,
         },
diff --git a/app/screens/post_options/post_options.js b/app/screens/post_options/post_options.js
index 004b6cc7f..1c4e53bb7 100644
--- a/app/screens/post_options/post_options.js
+++ b/app/screens/post_options/post_options.js
@@ -362,7 +362,7 @@ export default class PostOptions extends PureComponent {
                 closeButton: source,
             };
 
-            this.closeWithAnimation(() => showModal(screen, title, passProps));
+            this.closeWithAnimation(() => showModal(screen, title, passProps, {modal: {swipeToDismiss: false}}));
         });
     };