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 c6549a034..93c1f8167 100644
--- a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
+++ b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap
@@ -17,54 +17,55 @@ exports[`components/emoji_picker/EmojiPicker should match snapshot 1`] = `
   >
     <View
       style={
-        Array [
-          Object {
-            "backgroundColor": "rgba(61,60,64,0.2)",
-            "height": 50,
-            "paddingLeft": 8,
-            "paddingVertical": 5,
-          },
-          null,
-        ]
+        Object {
+          "backgroundColor": "rgba(61,60,64,0.2)",
+          "height": 50,
+          "paddingLeft": 8,
+          "paddingVertical": 5,
+        }
       }
     >
-      <Search
-        autoCapitalize="none"
-        backArrowSize={24}
-        backgroundColor="transparent"
-        blurOnSubmit={false}
-        cancelTitle="Cancel"
-        containerHeight={40}
-        deleteIconSize={20}
-        editable={true}
-        inputHeight={33}
-        inputStyle={
-          Object {
-            "backgroundColor": "#ffffff",
-            "color": "#3d3c40",
-            "fontSize": 13,
+      <View
+        style={null}
+      >
+        <Search
+          autoCapitalize="none"
+          backArrowSize={24}
+          backgroundColor="transparent"
+          blurOnSubmit={false}
+          cancelTitle="Cancel"
+          containerHeight={40}
+          deleteIconSize={20}
+          editable={true}
+          inputHeight={33}
+          inputStyle={
+            Object {
+              "backgroundColor": "#ffffff",
+              "color": "#3d3c40",
+              "fontSize": 13,
+            }
           }
-        }
-        keyboardAppearance="light"
-        keyboardShouldPersist={false}
-        keyboardType="default"
-        onAnimationComplete={[Function]}
-        onBlur={[Function]}
-        onCancelButtonPress={[Function]}
-        onChangeText={[Function]}
-        onSelectionChange={[Function]}
-        placeholder="Search"
-        placeholderTextColor="rgba(61,60,64,0.5)"
-        returnKeyType="search"
-        searchBarRightMargin={0}
-        searchIconSize={24}
-        showArrow={false}
-        showCancel={true}
-        tintColorDelete="rgba(61,60,64,0.5)"
-        tintColorSearch="rgba(61,60,64,0.8)"
-        titleCancelColor="#3d3c40"
-        value=""
-      />
+          keyboardAppearance="light"
+          keyboardShouldPersist={false}
+          keyboardType="default"
+          onAnimationComplete={[Function]}
+          onBlur={[Function]}
+          onCancelButtonPress={[Function]}
+          onChangeText={[Function]}
+          onSelectionChange={[Function]}
+          placeholder="Search"
+          placeholderTextColor="rgba(61,60,64,0.5)"
+          returnKeyType="search"
+          searchBarRightMargin={0}
+          searchIconSize={24}
+          showArrow={false}
+          showCancel={true}
+          tintColorDelete="rgba(61,60,64,0.5)"
+          tintColorSearch="rgba(61,60,64,0.8)"
+          titleCancelColor="#3d3c40"
+          value=""
+        />
+      </View>
     </View>
     <View
       style={
diff --git a/app/components/emoji_picker/emoji_picker.ios.js b/app/components/emoji_picker/emoji_picker.ios.js
index b14f1b18e..2d942ed45 100644
--- a/app/components/emoji_picker/emoji_picker.ios.js
+++ b/app/components/emoji_picker/emoji_picker.ios.js
@@ -47,25 +47,27 @@ export default class EmojiPicker extends EmojiPickerBase {
                     keyboardVerticalOffset={keyboardOffset}
                     style={styles.flex}
                 >
-                    <View style={[styles.searchBar, padding(isLandscape)]}>
-                        <SearchBar
-                            ref={this.setSearchBarRef}
-                            placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                            cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                            backgroundColor='transparent'
-                            inputHeight={33}
-                            inputStyle={searchBarInput}
-                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                            tintColorSearch={changeOpacity(theme.centerChannelColor, 0.8)}
-                            tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
-                            titleCancelColor={theme.centerChannelColor}
-                            onChangeText={this.changeSearchTerm}
-                            onCancelButtonPress={this.cancelSearch}
-                            autoCapitalize='none'
-                            value={searchTerm}
-                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                            onAnimationComplete={this.setRebuiltEmojis}
-                        />
+                    <View style={styles.searchBar}>
+                        <View style={padding(isLandscape)}>
+                            <SearchBar
+                                ref={this.setSearchBarRef}
+                                placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                                cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                                backgroundColor='transparent'
+                                inputHeight={33}
+                                inputStyle={searchBarInput}
+                                placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                                tintColorSearch={changeOpacity(theme.centerChannelColor, 0.8)}
+                                tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
+                                titleCancelColor={theme.centerChannelColor}
+                                onChangeText={this.changeSearchTerm}
+                                onCancelButtonPress={this.cancelSearch}
+                                autoCapitalize='none'
+                                value={searchTerm}
+                                keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                                onAnimationComplete={this.setRebuiltEmojis}
+                            />
+                        </View>
                     </View>
                     <View style={[styles.container]}>
                         {this.renderListComponent(shorten)}
diff --git a/app/components/search_bar/index.js b/app/components/search_bar/index.js
index 49e6fc895..b1ba8202b 100644
--- a/app/components/search_bar/index.js
+++ b/app/components/search_bar/index.js
@@ -38,6 +38,7 @@ export default class Search extends PureComponent {
         tintColorDelete: PropTypes.string,
         selectionColor: PropTypes.string,
         inputStyle: CustomPropTypes.Style,
+        containerStyle: CustomPropTypes.Style,
         cancelButtonStyle: CustomPropTypes.Style,
         autoFocus: PropTypes.bool,
         placeholder: PropTypes.string,
@@ -285,7 +286,7 @@ export default class Search extends PureComponent {
         }
 
         return (
-            <View style={searchBarStyle.container}>
+            <View style={[searchBarStyle.container, this.props.containerStyle]}>
                 {((this.props.leftComponent) ?
                     <Animated.View
                         style={{
@@ -385,7 +386,7 @@ const getSearchBarStyle = memoizeResult((
         justifyContent: 'flex-start',
         alignItems: 'center',
         height: containerHeight,
-        flex: 1,
+        overflow: 'hidden',
     },
     clearIconColorIos: tintColorDelete || styles.defaultColor.color,
     clearIconColorAndroid: titleCancelColor || placeholderTextColor,
diff --git a/app/components/sidebars/main/channels_list/channels_list.js b/app/components/sidebars/main/channels_list/channels_list.js
index 0676570f9..fee7ba74e 100644
--- a/app/components/sidebars/main/channels_list/channels_list.js
+++ b/app/components/sidebars/main/channels_list/channels_list.js
@@ -135,6 +135,7 @@ export default class ChannelsList extends PureComponent {
                     backgroundColor='transparent'
                     inputHeight={33}
                     inputStyle={searchBarInput}
+                    containerStyle={styles.flex}
                     placeholderTextColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
                     tintColorSearch={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
                     tintColorDelete={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
@@ -172,6 +173,9 @@ export default class ChannelsList extends PureComponent {
 
 const getStyleSheet = makeStyleSheetFromTheme((theme) => {
     return {
+        flex: {
+            flex: 1,
+        },
         above: {
             backgroundColor: theme.mentionBg,
             top: 40,
diff --git a/app/screens/channel_add_members/channel_add_members.js b/app/screens/channel_add_members/channel_add_members.js
index 7d0a1859c..99cadb774 100644
--- a/app/screens/channel_add_members/channel_add_members.js
+++ b/app/screens/channel_add_members/channel_add_members.js
@@ -334,25 +334,27 @@ export default class ChannelAddMembers extends PureComponent {
         return (
             <KeyboardLayout>
                 <StatusBar/>
-                <View style={[style.searchBar, padding(isLandscape)]}>
-                    <SearchBar
-                        ref={this.setSearchBarRef}
-                        placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                        cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                        backgroundColor='transparent'
-                        inputHeight={33}
-                        inputStyle={searchBarInput}
-                        placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
-                        titleCancelColor={theme.centerChannelColor}
-                        onChangeText={this.onSearch}
-                        onSearchButtonPress={this.onSearch}
-                        onCancelButtonPress={this.clearSearch}
-                        autoCapitalize='none'
-                        keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                        value={term}
-                    />
+                <View style={style.searchBar}>
+                    <View style={padding(isLandscape)}>
+                        <SearchBar
+                            ref={this.setSearchBarRef}
+                            placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                            cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                            backgroundColor='transparent'
+                            inputHeight={33}
+                            inputStyle={searchBarInput}
+                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
+                            titleCancelColor={theme.centerChannelColor}
+                            onChangeText={this.onSearch}
+                            onSearchButtonPress={this.onSearch}
+                            onCancelButtonPress={this.clearSearch}
+                            autoCapitalize='none'
+                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                            value={term}
+                        />
+                    </View>
                 </View>
                 <CustomList
                     data={data}
diff --git a/app/screens/channel_members/__snapshots__/channel_members.test.js.snap b/app/screens/channel_members/__snapshots__/channel_members.test.js.snap
index 5b7bc6271..3f057f1c7 100644
--- a/app/screens/channel_members/__snapshots__/channel_members.test.js.snap
+++ b/app/screens/channel_members/__snapshots__/channel_members.test.js.snap
@@ -5,53 +5,54 @@ exports[`ChannelMembers should match snapshot 1`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value=""
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value=""
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
diff --git a/app/screens/channel_members/channel_members.js b/app/screens/channel_members/channel_members.js
index 67eafa373..12ba33a50 100644
--- a/app/screens/channel_members/channel_members.js
+++ b/app/screens/channel_members/channel_members.js
@@ -363,25 +363,27 @@ export default class ChannelMembers extends PureComponent {
         return (
             <KeyboardLayout>
                 <StatusBar/>
-                <View style={[style.searchBar, padding(isLandscape)]}>
-                    <SearchBar
-                        ref={this.setSearchBarRef}
-                        placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                        cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                        backgroundColor='transparent'
-                        inputHeight={33}
-                        inputStyle={searchBarInput}
-                        placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
-                        titleCancelColor={theme.centerChannelColor}
-                        onChangeText={this.onSearch}
-                        onSearchButtonPress={this.onSearch}
-                        onCancelButtonPress={this.clearSearch}
-                        autoCapitalize='none'
-                        keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                        value={term}
-                    />
+                <View style={style.searchBar}>
+                    <View style={padding(isLandscape)}>
+                        <SearchBar
+                            ref={this.setSearchBarRef}
+                            placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                            cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                            backgroundColor='transparent'
+                            inputHeight={33}
+                            inputStyle={searchBarInput}
+                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
+                            titleCancelColor={theme.centerChannelColor}
+                            onChangeText={this.onSearch}
+                            onSearchButtonPress={this.onSearch}
+                            onCancelButtonPress={this.clearSearch}
+                            autoCapitalize='none'
+                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                            value={term}
+                        />
+                    </View>
                 </View>
                 <CustomList
                     data={data}
diff --git a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
index f8b2ce81b..430e4619c 100644
--- a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
+++ b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap
@@ -6,51 +6,52 @@ exports[`MoreChannels should match snapshot 1`] = `
   <React.Fragment>
     <View
       style={
-        Array [
-          Object {
-            "height": 38,
-            "marginVertical": 5,
-            "paddingLeft": 8,
-          },
-          null,
-        ]
+        Object {
+          "height": 38,
+          "marginVertical": 5,
+          "paddingLeft": 8,
+        }
       }
     >
-      <Search
-        autoCapitalize="none"
-        backArrowSize={24}
-        backgroundColor="transparent"
-        blurOnSubmit={false}
-        containerHeight={40}
-        deleteIconSize={20}
-        editable={true}
-        inputHeight={33}
-        inputStyle={
-          Object {
-            "backgroundColor": "rgba(61,60,64,0.2)",
-            "color": "#3d3c40",
-            "fontSize": 15,
+      <View
+        style={null}
+      >
+        <Search
+          autoCapitalize="none"
+          backArrowSize={24}
+          backgroundColor="transparent"
+          blurOnSubmit={false}
+          containerHeight={40}
+          deleteIconSize={20}
+          editable={true}
+          inputHeight={33}
+          inputStyle={
+            Object {
+              "backgroundColor": "rgba(61,60,64,0.2)",
+              "color": "#3d3c40",
+              "fontSize": 15,
+            }
           }
-        }
-        keyboardAppearance="light"
-        keyboardShouldPersist={false}
-        keyboardType="default"
-        onBlur={[Function]}
-        onCancelButtonPress={[Function]}
-        onChangeText={[Function]}
-        onSearchButtonPress={[Function]}
-        onSelectionChange={[Function]}
-        placeholderTextColor="rgba(61,60,64,0.5)"
-        returnKeyType="search"
-        searchBarRightMargin={0}
-        searchIconSize={24}
-        showArrow={false}
-        showCancel={true}
-        tintColorDelete="rgba(61,60,64,0.5)"
-        tintColorSearch="rgba(61,60,64,0.5)"
-        titleCancelColor="#3d3c40"
-        value=""
-      />
+          keyboardAppearance="light"
+          keyboardShouldPersist={false}
+          keyboardType="default"
+          onBlur={[Function]}
+          onCancelButtonPress={[Function]}
+          onChangeText={[Function]}
+          onSearchButtonPress={[Function]}
+          onSelectionChange={[Function]}
+          placeholderTextColor="rgba(61,60,64,0.5)"
+          returnKeyType="search"
+          searchBarRightMargin={0}
+          searchIconSize={24}
+          showArrow={false}
+          showCancel={true}
+          tintColorDelete="rgba(61,60,64,0.5)"
+          tintColorSearch="rgba(61,60,64,0.5)"
+          titleCancelColor="#3d3c40"
+          value=""
+        />
+      </View>
     </View>
     <View
       style={
diff --git a/app/screens/more_channels/more_channels.js b/app/screens/more_channels/more_channels.js
index 52faefdc2..d2d6e07f6 100644
--- a/app/screens/more_channels/more_channels.js
+++ b/app/screens/more_channels/more_channels.js
@@ -452,25 +452,27 @@ export default class MoreChannels extends PureComponent {
 
             content = (
                 <React.Fragment>
-                    <View style={[style.searchBar, padding(isLandscape)]}>
-                        <SearchBar
-                            ref={this.setSearchBarRef}
-                            placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                            cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                            backgroundColor='transparent'
-                            inputHeight={33}
-                            inputStyle={searchBarInput}
-                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                            tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
-                            tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
-                            titleCancelColor={theme.centerChannelColor}
-                            onChangeText={this.searchChannels}
-                            onSearchButtonPress={this.searchChannels}
-                            onCancelButtonPress={this.cancelSearch}
-                            autoCapitalize='none'
-                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                            value={term}
-                        />
+                    <View style={style.searchBar}>
+                        <View style={padding(isLandscape)}>
+                            <SearchBar
+                                ref={this.setSearchBarRef}
+                                placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                                cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                                backgroundColor='transparent'
+                                inputHeight={33}
+                                inputStyle={searchBarInput}
+                                placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                                tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
+                                tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
+                                titleCancelColor={theme.centerChannelColor}
+                                onChangeText={this.searchChannels}
+                                onSearchButtonPress={this.searchChannels}
+                                onCancelButtonPress={this.cancelSearch}
+                                autoCapitalize='none'
+                                keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                                value={term}
+                            />
+                        </View>
                     </View>
                     {channelDropdown}
                     <CustomList
diff --git a/app/screens/more_dms/more_dms.js b/app/screens/more_dms/more_dms.js
index e035d54ef..b5984b7fc 100644
--- a/app/screens/more_dms/more_dms.js
+++ b/app/screens/more_dms/more_dms.js
@@ -52,7 +52,7 @@ export default class MoreDirectMessages extends PureComponent {
         currentDisplayName: PropTypes.string,
         currentTeamId: PropTypes.string.isRequired,
         currentUserId: PropTypes.string.isRequired,
-        isGuest: PropTypes.object.isRequired,
+        isGuest: PropTypes.bool,
         restrictDirectMessage: PropTypes.bool.isRequired,
         teammateNameDisplay: PropTypes.string,
         theme: PropTypes.object.isRequired,
@@ -472,25 +472,27 @@ export default class MoreDirectMessages extends PureComponent {
         return (
             <KeyboardLayout>
                 <StatusBar/>
-                <View style={[style.searchBar, padding(isLandscape)]}>
-                    <SearchBar
-                        ref={this.setSearchBarRef}
-                        placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                        cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                        backgroundColor='transparent'
-                        inputHeight={33}
-                        inputStyle={searchBarInput}
-                        placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
-                        titleCancelColor={theme.centerChannelColor}
-                        onChangeText={this.onSearch}
-                        onSearchButtonPress={this.onSearch}
-                        onCancelButtonPress={this.clearSearch}
-                        autoCapitalize='none'
-                        keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                        value={term}
-                    />
+                <View style={style.searchBar}>
+                    <View style={padding(isLandscape)}>
+                        <SearchBar
+                            ref={this.setSearchBarRef}
+                            placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                            cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                            backgroundColor='transparent'
+                            inputHeight={33}
+                            inputStyle={searchBarInput}
+                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
+                            titleCancelColor={theme.centerChannelColor}
+                            onChangeText={this.onSearch}
+                            onSearchButtonPress={this.onSearch}
+                            onCancelButtonPress={this.clearSearch}
+                            autoCapitalize='none'
+                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                            value={term}
+                        />
+                    </View>
                 </View>
                 <SelectedUsers
                     selectedIds={this.state.selectedIds}
@@ -501,6 +503,7 @@ export default class MoreDirectMessages extends PureComponent {
                 <CustomList
                     data={data}
                     extraData={selectedIds}
+                    isLandscape={isLandscape}
                     key='custom_list'
                     listType={listType}
                     loading={loading}
diff --git a/app/screens/search/search.js b/app/screens/search/search.js
index fc5fb1b24..f9909d456 100644
--- a/app/screens/search/search.js
+++ b/app/screens/search/search.js
@@ -713,7 +713,7 @@ export default class Search extends PureComponent {
             paddingRes.paddingLeft = null;
 
             if (isLandscape) {
-                paddingRes.paddingTop = 10;
+                paddingRes.paddingTop = 5;
             }
         }
 
diff --git a/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap b/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap
index 7b60f53cf..9568c2437 100644
--- a/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap
+++ b/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap
@@ -11,53 +11,54 @@ exports[`SelectorScreen should match snapshot for channels 1`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value=""
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value=""
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
@@ -116,53 +117,54 @@ exports[`SelectorScreen should match snapshot for channels 2`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value=""
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value=""
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
@@ -221,53 +223,54 @@ exports[`SelectorScreen should match snapshot for explicit options 1`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value=""
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value=""
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
@@ -333,53 +336,54 @@ exports[`SelectorScreen should match snapshot for searching 1`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value="name2"
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value="name2"
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
@@ -438,53 +442,54 @@ exports[`SelectorScreen should match snapshot for users 1`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value=""
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value=""
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
@@ -543,53 +548,54 @@ exports[`SelectorScreen should match snapshot for users 2`] = `
   <Connect(StatusBar) />
   <View
     style={
-      Array [
-        Object {
-          "height": 38,
-          "marginVertical": 5,
-          "paddingLeft": 8,
-        },
-        null,
-      ]
+      Object {
+        "height": 38,
+        "marginVertical": 5,
+        "paddingLeft": 8,
+      }
     }
   >
-    <Search
-      autoCapitalize="none"
-      backArrowSize={24}
-      backgroundColor="transparent"
-      blurOnSubmit={false}
-      cancelTitle="Cancel"
-      containerHeight={40}
-      deleteIconSize={20}
-      editable={true}
-      inputHeight={33}
-      inputStyle={
-        Object {
-          "backgroundColor": "rgba(61,60,64,0.2)",
-          "color": "#3d3c40",
-          "fontSize": 15,
+    <View
+      style={null}
+    >
+      <Search
+        autoCapitalize="none"
+        backArrowSize={24}
+        backgroundColor="transparent"
+        blurOnSubmit={false}
+        cancelTitle="Cancel"
+        containerHeight={40}
+        deleteIconSize={20}
+        editable={true}
+        inputHeight={33}
+        inputStyle={
+          Object {
+            "backgroundColor": "rgba(61,60,64,0.2)",
+            "color": "#3d3c40",
+            "fontSize": 15,
+          }
         }
-      }
-      keyboardAppearance="light"
-      keyboardShouldPersist={false}
-      keyboardType="default"
-      onBlur={[Function]}
-      onCancelButtonPress={[Function]}
-      onChangeText={[Function]}
-      onSearchButtonPress={[Function]}
-      onSelectionChange={[Function]}
-      placeholder="Search"
-      placeholderTextColor="rgba(61,60,64,0.5)"
-      returnKeyType="search"
-      searchBarRightMargin={0}
-      searchIconSize={24}
-      showArrow={false}
-      showCancel={true}
-      tintColorDelete="rgba(61,60,64,0.5)"
-      tintColorSearch="rgba(61,60,64,0.5)"
-      titleCancelColor="#3d3c40"
-      value=""
-    />
+        keyboardAppearance="light"
+        keyboardShouldPersist={false}
+        keyboardType="default"
+        onBlur={[Function]}
+        onCancelButtonPress={[Function]}
+        onChangeText={[Function]}
+        onSearchButtonPress={[Function]}
+        onSelectionChange={[Function]}
+        placeholder="Search"
+        placeholderTextColor="rgba(61,60,64,0.5)"
+        returnKeyType="search"
+        searchBarRightMargin={0}
+        searchIconSize={24}
+        showArrow={false}
+        showCancel={true}
+        tintColorDelete="rgba(61,60,64,0.5)"
+        tintColorSearch="rgba(61,60,64,0.5)"
+        titleCancelColor="#3d3c40"
+        value=""
+      />
+    </View>
   </View>
   <CustomList
     canRefresh={true}
diff --git a/app/screens/selector_screen/selector_screen.js b/app/screens/selector_screen/selector_screen.js
index 4ffb71fa1..3d3f7eed1 100644
--- a/app/screens/selector_screen/selector_screen.js
+++ b/app/screens/selector_screen/selector_screen.js
@@ -316,25 +316,27 @@ export default class SelectorScreen extends PureComponent {
         return (
             <View style={style.container}>
                 <StatusBar/>
-                <View style={[style.searchBar, padding(isLandscape)]}>
-                    <SearchBar
-                        ref={this.setSearchBarRef}
-                        placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                        cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                        backgroundColor='transparent'
-                        inputHeight={33}
-                        inputStyle={searchBarInput}
-                        placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
-                        tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
-                        titleCancelColor={theme.centerChannelColor}
-                        onChangeText={this.onSearch}
-                        onSearchButtonPress={this.onSearch}
-                        onCancelButtonPress={this.clearSearch}
-                        autoCapitalize='none'
-                        keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                        value={term}
-                    />
+                <View style={style.searchBar}>
+                    <View style={padding(isLandscape)}>
+                        <SearchBar
+                            ref={this.setSearchBarRef}
+                            placeholder={formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                            cancelTitle={formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                            backgroundColor='transparent'
+                            inputHeight={33}
+                            inputStyle={searchBarInput}
+                            placeholderTextColor={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorSearch={changeOpacity(theme.centerChannelColor, 0.5)}
+                            tintColorDelete={changeOpacity(theme.centerChannelColor, 0.5)}
+                            titleCancelColor={theme.centerChannelColor}
+                            onChangeText={this.onSearch}
+                            onSearchButtonPress={this.onSearch}
+                            onCancelButtonPress={this.clearSearch}
+                            autoCapitalize='none'
+                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                            value={term}
+                        />
+                    </View>
                 </View>
                 <CustomList
                     data={data}
diff --git a/app/screens/settings/timezone/select_timezone/select_timezone.js b/app/screens/settings/timezone/select_timezone/select_timezone.js
index b5dce98ee..497c76c3c 100644
--- a/app/screens/settings/timezone/select_timezone/select_timezone.js
+++ b/app/screens/settings/timezone/select_timezone/select_timezone.js
@@ -112,26 +112,28 @@ export default class Timezone extends PureComponent {
         return (
             <View style={style.container}>
                 <StatusBar/>
-                <View style={[style.header, padding(isLandscape)]}>
-                    <SearchBar
-                        ref={this.setSearchBarRef}
-                        placeholder={intl.formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
-                        cancelTitle={intl.formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
-                        backgroundColor='transparent'
-                        inputHeight={Platform.OS === 'ios' ? 33 : 46}
-                        inputStyle={searchBarInput}
-                        placeholderTextColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
-                        selectionColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
-                        tintColorSearch={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
-                        tintColorDelete={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
-                        titleCancelColor={theme.sidebarHeaderTextColor}
-                        onChangeText={this.handleTextChanged}
-                        autoCapitalize='none'
-                        value={value}
-                        containerStyle={style.searchBarContainer}
-                        showArrow={false}
-                        keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
-                    />
+                <View style={style.header}>
+                    <View style={padding(isLandscape)}>
+                        <SearchBar
+                            ref={this.setSearchBarRef}
+                            placeholder={intl.formatMessage({id: 'search_bar.search', defaultMessage: 'Search'})}
+                            cancelTitle={intl.formatMessage({id: 'mobile.post.cancel', defaultMessage: 'Cancel'})}
+                            backgroundColor='transparent'
+                            inputHeight={Platform.OS === 'ios' ? 33 : 46}
+                            inputStyle={searchBarInput}
+                            placeholderTextColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
+                            selectionColor={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
+                            tintColorSearch={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
+                            tintColorDelete={changeOpacity(theme.sidebarHeaderTextColor, 0.5)}
+                            titleCancelColor={theme.sidebarHeaderTextColor}
+                            onChangeText={this.handleTextChanged}
+                            autoCapitalize='none'
+                            value={value}
+                            containerStyle={style.searchBarContainer}
+                            showArrow={false}
+                            keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
+                        />
+                    </View>
                 </View>
                 <FlatList
                     data={this.filteredTimezones(value)}