diff --git a/components/DropDownMenu/DropDownModal.js b/components/DropDownMenu/DropDownModal.js
index 19d44474..b4c65cb3 100644
--- a/components/DropDownMenu/DropDownModal.js
+++ b/components/DropDownMenu/DropDownModal.js
@@ -80,8 +80,8 @@ class DropDownModal extends PureComponent {
     this.emitOnOptionSelectedEvent = this.emitOnOptionSelectedEvent.bind(this);
     this.getKeyAreaHeights = this.getKeyAreaHeights.bind(this);
     this.renderGradient = this.renderGradient.bind(this);
+    this.resolveListViewStyle = this.resolveListViewStyle.bind(this);
     this.renderRow = this.renderRow.bind(this);
-    this.resolveModalStyle = this.resolveModalStyle.bind(this);
     this.selectOption = this.selectOption.bind(this);
     this.onOptionLayout = this.onOptionLayout.bind(this);
 
@@ -146,19 +146,21 @@ class DropDownModal extends PureComponent {
   }
 
   resolveListViewStyle() {
-    const listViewHeight = this.calculateListViewHeight();
-
-    return { flex: 0, maxHeight: listViewHeight };
-  }
-
-  resolveModalStyle() {
-    const { style } = this.props;
+    const { style, options } = this.props;
 
     const { bufferHeight } = this.getKeyAreaHeights();
+    const visibleOptions = this.getVisibleOptions();
+
+    const padding = style.modal.paddingVertical ? bufferHeight - style.modal.paddingVertical : bufferHeight;
+    const flex = _.size(options) >= visibleOptions ? 0 : 1;
 
     return {
-      ...style.modal,
-      paddingTop: style.modal.paddingTop + bufferHeight,
+      listContent: {
+        flex,
+        backgroundColor: style.modal.backgroundColor,
+        paddingVertical: Math.min(250, padding),
+        justifyContent: 'center',
+      },
     };
   }
 
@@ -200,7 +202,6 @@ class DropDownModal extends PureComponent {
   renderGradient() {
     const { style } = this.props;
     const { backgroundColor } = style.modal;
-    const { optionHeight } = this.state;
 
     // We divide the modal screen per key areas to which we apply a layer of gradient
     // Screen ratio is represented in (0 - 1) format, where the ratio of 1 represents the entire
@@ -229,22 +230,22 @@ class DropDownModal extends PureComponent {
 
     const gradientConfig = [{
       location: 0,
-      color: bufferColor
-    },{
-      location: bufferHeight / screenHeight,
+      color: changeColorAlpha(bufferColor, 1),
+    }, {
+      location: Math.min(0.25, bufferHeight / screenHeight),
       color: backgroundColor
-    },{
+    }, {
       location: (bufferHeight + gradientHeight) / screenHeight,
       color: invertedColor
-    },{
+    }, {
       location: (bufferHeight + gradientHeight + transparencyHeight) / screenHeight,
       color: invertedColor,
-    },{
-      location: (bufferHeight + listViewHeight) / screenHeight,
+    }, {
+      location: Math.max((bufferHeight + listViewHeight) / screenHeight, 0.75),
       color: backgroundColor
-    },{
+    }, {
       location: 1,
-      color: bufferColor
+      color: changeColorAlpha(bufferColor, 1),
     }];
 
     return (
@@ -282,7 +283,6 @@ class DropDownModal extends PureComponent {
       return null;
     }
 
-    const modalStyle = this.resolveModalStyle();
     const listViewStyle = this.resolveListViewStyle();
     const data = options.filter((option) => option[titleProperty]);
 
@@ -294,7 +294,7 @@ class DropDownModal extends PureComponent {
       >
         <ZoomOut driver={this.timingDriver} maxFactor={1.1} style={{ flex: 1 }}>
           <FadeIn driver={this.timingDriver} style={{ flex: 1 }}>
-            <View style={modalStyle}>
+            <View style={style.modal}>
               {modalContentVisible &&
                 <ListView
                   data={data}
diff --git a/helpers/keyboard.js b/helpers/keyboard.js
index 297c5c9b..bc434eaf 100644
--- a/helpers/keyboard.js
+++ b/helpers/keyboard.js
@@ -1,10 +1,18 @@
-import { IPHONE_X_HOME_INDICATOR_PADDING } from '../const';
+import { Platform } from 'react-native';
+import { getStatusBarHeight } from 'react-native-status-bar-height';
+import { IPHONE_X_HOME_INDICATOR_PADDING, NAVIGATION_HEADER_HEIGHT } from '../const';
 import { Device } from './device-selector';
 
-export function calculateKeyboardOffset(extraOffset = 0) {
-  return (Device.isIphoneX || Device.isIphoneXR)
-    ? IPHONE_X_HOME_INDICATOR_PADDING + extraOffset
-    : extraOffset;
+export function calculateKeyboardOffset(extraOffset = NAVIGATION_HEADER_HEIGHT) {
+  if (Platform.OS === 'ios') {
+    return (Device.isIphoneX || Device.isIphoneXR)
+      ? IPHONE_X_HOME_INDICATOR_PADDING + extraOffset
+      : extraOffset;
+  }
+
+  if (Platform.OS === 'android') {
+    return getStatusBarHeight() + extraOffset;
+  }
 }
 
 export default { calculateKeyboardOffset };
diff --git a/package-lock.json b/package-lock.json
index 04fc1799..a1e0649a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "2.0.8",
+  "version": "2.0.15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2031,11 +2031,6 @@
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
-    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -3295,14 +3290,13 @@
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "fs-extra": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "requires": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs.realpath": {
@@ -4652,12 +4646,11 @@
       }
     },
     "jsonfile": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^1.0.0"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -7578,6 +7571,11 @@
       "resolved": "https://registry.npmjs.org/react-native-scroller/-/react-native-scroller-0.0.6.tgz",
       "integrity": "sha1-3qjIm9HKLSRF+7azqQlg32wXZ/8="
     },
+    "react-native-status-bar-height": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/react-native-status-bar-height/-/react-native-status-bar-height-2.5.0.tgz",
+      "integrity": "sha512-sYBCPYA/NapBSHkdm/IVL4ID3LLlIuLqINi2FBDyMkc2BU9pfSGOtkz9yfxoK39mYJuTrlTOQ7mManARUsYDSA=="
+    },
     "react-native-transformable-image": {
       "version": "github:shoutem/react-native-transformable-image#ef2e93fa9425bbb479bccec64d165ec85e76e949",
       "from": "github:shoutem/react-native-transformable-image#v0.0.20",
@@ -8667,9 +8665,9 @@
       }
     },
     "universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unpipe": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 5fcc536d..cfe7307f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "Styleable set of components for React Native applications",
   "dependencies": {
     "@shoutem/animation": "~0.12.4",
@@ -21,6 +21,7 @@
     "react-native-linear-gradient": "~2.5.6",
     "react-native-photo-view": "shoutem/react-native-photo-view#0ffa1481f6b6cb8663cb291b7db1d6644440584d",
     "react-native-render-html": "~4.2.0",
+    "react-native-status-bar-height": "2.5.0",
     "react-native-transformable-image": "shoutem/react-native-transformable-image#v0.0.20",
     "react-native-vector-icons": "~6.6.0",
     "react-native-webview": "9.4.0",
diff --git a/theme.js b/theme.js
index e3082b72..9fb617dd 100644
--- a/theme.js
+++ b/theme.js
@@ -1993,8 +1993,6 @@ export default (variables = defaultThemeVariables) => ({
         alignSelf: 'stretch',
         ...variables.subtitle,
       },
-
-      flex: 1,
     },
 
     visibleOptions: 8,