diff --git a/app/screens/settings/advanced_settings/advanced_settings.js b/app/screens/settings/advanced_settings/advanced_settings.js
index 0dfa77e2a..92c291ee7 100644
--- a/app/screens/settings/advanced_settings/advanced_settings.js
+++ b/app/screens/settings/advanced_settings/advanced_settings.js
@@ -8,6 +8,7 @@ import {
     ActivityIndicator,
     Alert,
     Platform,
+    ScrollView,
     Text,
     View
 } from 'react-native';
@@ -120,7 +121,10 @@ class AdvancedSettings extends PureComponent {
         return (
             <View style={style.container}>
                 <StatusBar/>
-                <View style={style.wrapper}>
+                <ScrollView
+                    contentContainerStyle={style.wrapper}
+                    alwaysBounceVertical={false}
+                >
                     <View style={style.divider}/>
                     <SettingsItem
                         defaultMessage='Reset Cache'
@@ -145,7 +149,7 @@ class AdvancedSettings extends PureComponent {
                         theme={theme}
                     />
                     <View style={style.divider}/>
-                </View>
+                </ScrollView>
             </View>
         );
     }
@@ -159,7 +163,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         },
         wrapper: {
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
-            flex: 1,
             ...Platform.select({
                 ios: {
                     paddingTop: 35
diff --git a/app/screens/settings/general/settings.js b/app/screens/settings/general/settings.js
index f9d8ba322..ee41d0804 100644
--- a/app/screens/settings/general/settings.js
+++ b/app/screens/settings/general/settings.js
@@ -8,6 +8,7 @@ import {
     InteractionManager,
     Linking,
     Platform,
+    ScrollView,
     View
 } from 'react-native';
 import DeviceInfo from 'react-native-device-info';
@@ -214,7 +215,10 @@ class Settings extends PureComponent {
         return (
             <View style={style.container}>
                 <StatusBar/>
-                <View style={style.wrapper}>
+                <ScrollView
+                    alwaysBounceVertical={false}
+                    contentContainerStyle={style.wrapper}
+                >
                     <View style={style.divider}/>
                     <SettingsItem
                         defaultMessage='Notifications'
@@ -301,7 +305,7 @@ class Settings extends PureComponent {
                         />
                         <View style={style.divider}/>
                     </View>
-                </View>
+                </ScrollView>
             </View>
         );
     }
@@ -315,7 +319,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         },
         wrapper: {
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
-            flex: 1,
             ...Platform.select({
                 ios: {
                     paddingTop: 35
diff --git a/app/screens/settings/notification_settings/notification_settings.js b/app/screens/settings/notification_settings/notification_settings.js
index 9b2bdcf02..3eba4d71c 100644
--- a/app/screens/settings/notification_settings/notification_settings.js
+++ b/app/screens/settings/notification_settings/notification_settings.js
@@ -8,6 +8,7 @@ import {
     Alert,
     Modal,
     Platform,
+    ScrollView,
     TouchableOpacity,
     View
 } from 'react-native';
@@ -341,7 +342,10 @@ class NotificationSettings extends PureComponent {
         return (
             <View style={style.container}>
                 <StatusBar/>
-                <View style={style.wrapper}>
+                <ScrollView
+                    contentContainerStyle={style.wrapper}
+                    alwaysBounceVertical={false}
+                >
                     <View style={style.divider}/>
                     <SettingsItem
                         defaultMessage='Mentions and Replies'
@@ -374,7 +378,7 @@ class NotificationSettings extends PureComponent {
                         theme={theme}
                     />
                     <View style={style.divider}/>
-                </View>
+                </ScrollView>
                 {this.renderEmailNotificationSettings(style)}
             </View>
         );
@@ -389,7 +393,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         },
         wrapper: {
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
-            flex: 1,
             ...Platform.select({
                 ios: {
                     paddingTop: 35
diff --git a/app/screens/settings/notification_settings_email/notification_settings_email.js b/app/screens/settings/notification_settings_email/notification_settings_email.js
index e0477ccb3..9738578e1 100644
--- a/app/screens/settings/notification_settings_email/notification_settings_email.js
+++ b/app/screens/settings/notification_settings_email/notification_settings_email.js
@@ -212,6 +212,7 @@ export default class NotificationSettingsEmail extends PureComponent {
                 <ScrollView
                     style={style.scrollView}
                     contentContainerStyle={style.scrollViewContent}
+                    alwaysBounceVertical={false}
                 >
                     {this.renderEmailSection()}
                 </ScrollView>
diff --git a/app/screens/settings/notification_settings_mentions/notification_settings_mentions.ios.js b/app/screens/settings/notification_settings_mentions/notification_settings_mentions.ios.js
index 05f2c2304..ae0abacf6 100644
--- a/app/screens/settings/notification_settings_mentions/notification_settings_mentions.ios.js
+++ b/app/screens/settings/notification_settings_mentions/notification_settings_mentions.ios.js
@@ -199,6 +199,7 @@ class NotificationSettingsMentionsIos extends NotificationSettingsMentionsBase {
                 <ScrollView
                     style={style.scrollView}
                     contentContainerStyle={style.scrollViewContent}
+                    alwaysBounceVertical={false}
                 >
                     {this.renderMentionSection(style)}
                     {this.renderReplySection(style)}
diff --git a/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js b/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
index 4fd190d89..e6e30a633 100644
--- a/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
+++ b/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.js
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {View} from 'react-native';
+import {ScrollView, View} from 'react-native';
 
 import FormattedText from 'app/components/formatted_text';
 import StatusBar from 'app/components/status_bar';
@@ -68,7 +68,10 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
         return (
             <View style={style.container}>
                 <StatusBar/>
-                <View style={style.wrapper}>
+                <ScrollView
+                    contentContainerStyle={style.wrapper}
+                    alwaysBounceVertical={false}
+                >
                     <View style={style.inputContainer}>
                         <TextInputWithLocalizedPlaceholder
                             autoFocus={true}
@@ -93,7 +96,7 @@ export default class NotificationSettingsMentionsKeywords extends PureComponent
                             style={style.help}
                         />
                     </View>
-                </View>
+                </ScrollView>
             </View>
         );
     }
@@ -106,7 +109,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             backgroundColor: theme.centerChannelBg
         },
         wrapper: {
-            flex: 1,
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.06),
             paddingTop: 35
         },
diff --git a/app/screens/settings/notification_settings_mobile/notification_settings_mobile.android.js b/app/screens/settings/notification_settings_mobile/notification_settings_mobile.android.js
index df1a2c7fd..ff578157d 100644
--- a/app/screens/settings/notification_settings_mobile/notification_settings_mobile.android.js
+++ b/app/screens/settings/notification_settings_mobile/notification_settings_mobile.android.js
@@ -639,6 +639,7 @@ class NotificationSettingsMobileAndroid extends NotificationSettingsMobileBase {
                 <ScrollView
                     style={style.scrollView}
                     contentContainerStyle={style.scrollViewContent}
+                    alwaysBounceVertical={false}
                 >
                     {this.renderMobilePushSection()}
                     <View style={style.separator}/>
diff --git a/app/screens/settings/notification_settings_mobile/notification_settings_mobile.ios.js b/app/screens/settings/notification_settings_mobile/notification_settings_mobile.ios.js
index 0f1390fe2..47e834e3d 100644
--- a/app/screens/settings/notification_settings_mobile/notification_settings_mobile.ios.js
+++ b/app/screens/settings/notification_settings_mobile/notification_settings_mobile.ios.js
@@ -153,6 +153,7 @@ class NotificationSettingsMobileIos extends NotificationSettingsMobileBase {
                 <ScrollView
                     style={style.scrollView}
                     contentContainerStyle={style.scrollViewContent}
+                    alwaysBounceVertical={false}
                 >
                     {this.renderMobilePushSection(style)}
                     {this.renderMobilePushStatusSection(style)}