diff --git a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
index 6a55e1417..5802db973 100644
--- a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
+++ b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
@@ -8,7 +8,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = `
   <KeyboardAvoidingView
     behavior="padding"
     enabled={false}
-    keyboardVerticalOffset={50}
+    keyboardVerticalOffset={80}
     style={
       Object {
         "flex": 1,
diff --git a/app/components/emoji_picker/emoji_picker.ios.js b/app/components/emoji_picker/emoji_picker.ios.js
index 2d942ed45..64e9d2632 100644
--- a/app/components/emoji_picker/emoji_picker.ios.js
+++ b/app/components/emoji_picker/emoji_picker.ios.js
@@ -25,7 +25,7 @@ export default class EmojiPicker extends EmojiPickerBase {
 
         const shorten = DeviceTypes.IS_IPHONE_WITH_INSETS && isLandscape ? 6 : 2;
 
-        let keyboardOffset = DeviceTypes.IS_IPHONE_WITH_INSETS ? 50 : 30;
+        let keyboardOffset = DeviceTypes.IS_IPHONE_WITH_INSETS ? 80 : 60;
         if (isLandscape) {
             keyboardOffset = DeviceTypes.IS_IPHONE_WITH_INSETS ? 0 : 10;
         }
diff --git a/app/components/emoji_picker/emoji_picker_base.js b/app/components/emoji_picker/emoji_picker_base.js
index cc4919512..14d25c2aa 100644
--- a/app/components/emoji_picker/emoji_picker_base.js
+++ b/app/components/emoji_picker/emoji_picker_base.js
@@ -251,6 +251,8 @@ export default class EmojiPicker extends PureComponent {
 
         let listComponent;
         if (searchTerm) {
+            const contentContainerStyle = filteredEmojis.length ? null : styles.flex;
+
             listComponent = (
                 <FlatList
                     data={filteredEmojis}
@@ -261,7 +263,7 @@ export default class EmojiPicker extends PureComponent {
                     pageSize={10}
                     renderItem={this.flatListRenderItem}
                     ListEmptyComponent={this.renderEmptyList}
-                    contentContainerStyle={styles.flex}
+                    contentContainerStyle={contentContainerStyle}
                     style={styles.flatList}
                 />
             );