diff --git a/app/screens/settings/theme/__snapshots__/theme.test.js.snap b/app/screens/settings/theme/__snapshots__/theme.test.js.snap
index 3fbf49d8e..9d8cec86c 100644
--- a/app/screens/settings/theme/__snapshots__/theme.test.js.snap
+++ b/app/screens/settings/theme/__snapshots__/theme.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Theme should match snapshot 1`] = `
-<View
+<ScrollView
   style={
     Object {
       "flex": 1,
@@ -390,5 +390,5 @@ exports[`Theme should match snapshot 1`] = `
       />
     </View>
   </View>
-</View>
+</ScrollView>
 `;
diff --git a/app/screens/settings/theme/theme.js b/app/screens/settings/theme/theme.js
index e847ddabf..85f0b0d8a 100644
--- a/app/screens/settings/theme/theme.js
+++ b/app/screens/settings/theme/theme.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {intlShape} from 'react-intl';
 import {Text, View} from 'react-native';
+import {ScrollView} from 'react-native-gesture-handler';
 import {SafeAreaView} from 'react-native-safe-area-context';
 
 import FormattedText from '@components/formatted_text';
@@ -112,7 +113,7 @@ export default class Theme extends React.PureComponent {
         const {customTheme} = this.state;
         const style = getStyleSheet(theme);
         return (
-            <View style={style.container}>
+            <ScrollView style={style.container}>
                 <StatusBar/>
                 <View style={style.wrapper}>
                     <View style={style.tilesContainer}>
@@ -132,7 +133,7 @@ export default class Theme extends React.PureComponent {
                         </SafeAreaView>
                     }
                 </View>
-            </View>
+            </ScrollView>
         );
     }
 }