diff --git a/app/components/autocomplete/autocomplete.js b/app/components/autocomplete/autocomplete.js
index af64017dd..f99884e76 100644
--- a/app/components/autocomplete/autocomplete.js
+++ b/app/components/autocomplete/autocomplete.js
@@ -3,10 +3,7 @@
 
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {
-    Platform,
-    View
-} from 'react-native';
+import {View} from 'react-native';
 
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 
@@ -123,15 +120,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             elevation: 5,
             flex: 1,
             maxHeight: 250,
-            zIndex: 5,
-            ...Platform.select({
-                android: {
-                    top: 47
-                },
-                ios: {
-                    top: 64
-                }
-            })
+            zIndex: 5
         }
     };
 });
diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
index ccd24e073..4c1748054 100644
--- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
+++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
@@ -24,6 +24,7 @@ export default class EmojiSuggestion extends Component {
         }).isRequired,
         cursorPosition: PropTypes.number,
         emojis: PropTypes.array.isRequired,
+        isSearch: PropTypes.bool,
         theme: PropTypes.object.isRequired,
         onChangeText: PropTypes.func.isRequired,
         onResultCountChange: PropTypes.func.isRequired,
@@ -42,6 +43,10 @@ export default class EmojiSuggestion extends Component {
     };
 
     componentWillReceiveProps(nextProps) {
+        if (nextProps.isSearch) {
+            return;
+        }
+
         const regex = EMOJI_REGEX;
         const match = nextProps.value.substring(0, nextProps.cursorPosition).match(regex);
 
diff --git a/app/components/autocomplete/slash_suggestion/slash_suggestion.js b/app/components/autocomplete/slash_suggestion/slash_suggestion.js
index 7a7373264..4785c54d3 100644
--- a/app/components/autocomplete/slash_suggestion/slash_suggestion.js
+++ b/app/components/autocomplete/slash_suggestion/slash_suggestion.js
@@ -24,6 +24,7 @@ export default class SlashSuggestion extends Component {
         currentTeamId: PropTypes.string.isRequired,
         commands: PropTypes.array,
         commandsRequest: PropTypes.object.isRequired,
+        isSearch: PropTypes.bool,
         theme: PropTypes.object.isRequired,
         onChangeText: PropTypes.func.isRequired,
         onResultCountChange: PropTypes.func.isRequired,
@@ -43,6 +44,10 @@ export default class SlashSuggestion extends Component {
     };
 
     componentWillReceiveProps(nextProps) {
+        if (nextProps.isSearch) {
+            return;
+        }
+
         const {currentTeamId} = this.props;
         const {
             commands: nextCommands,