diff --git a/app/components/offline_indicator/offline_indicator.js b/app/components/offline_indicator/offline_indicator.js
index 4f836d615..3684d9f5f 100644
--- a/app/components/offline_indicator/offline_indicator.js
+++ b/app/components/offline_indicator/offline_indicator.js
@@ -15,6 +15,7 @@ import DeviceInfo from 'react-native-device-info';
 import IonIcon from 'react-native-vector-icons/Ionicons';
 
 import FormattedText from 'app/components/formatted_text';
+import {ViewTypes} from 'app/constants';
 import checkNetwork from 'app/utils/network';
 
 import {RequestStatus} from 'mattermost-redux/constants';
@@ -23,6 +24,14 @@ const HEIGHT = 38;
 const OFFLINE = 'offline';
 const CONNECTING = 'connecting';
 const CONNECTED = 'connected';
+const {
+    ANDROID_TOP_LANDSCAPE,
+    ANDROID_TOP_PORTRAIT,
+    IOS_TOP_LANDSCAPE,
+    IOS_TOP_PORTRAIT,
+    IOSX_TOP_PORTRAIT,
+    STATUS_BAR_HEIGHT
+} = ViewTypes;
 
 export default class OfflineIndicator extends Component {
     static propTypes = {
@@ -126,20 +135,23 @@ export default class OfflineIndicator extends Component {
     };
 
     getNavBarHeight = (isLandscape) => {
-        let navBar = 46;
-        if (Platform.OS === 'ios') {
-            if (this.isX && isLandscape) {
-                navBar = 32;
-            } else if (this.isX) {
-                navBar = 88;
-            } else if (isLandscape) {
-                navBar = 52;
-            } else {
-                navBar = 64;
+        if (Platform.OS === 'android') {
+            if (isLandscape) {
+                return ANDROID_TOP_LANDSCAPE;
             }
+
+            return ANDROID_TOP_PORTRAIT;
         }
 
-        return navBar;
+        if (this.isX && isLandscape) {
+            return IOS_TOP_LANDSCAPE;
+        } else if (this.isX) {
+            return IOSX_TOP_PORTRAIT;
+        } else if (isLandscape) {
+            return IOS_TOP_LANDSCAPE + STATUS_BAR_HEIGHT;
+        }
+
+        return IOS_TOP_PORTRAIT;
     };
 
     offline = () => {
diff --git a/app/constants/view.js b/app/constants/view.js
index 6c74e8b80..6c3ad6c65 100644
--- a/app/constants/view.js
+++ b/app/constants/view.js
@@ -74,5 +74,6 @@ export default {
     ANDROID_TOP_PORTRAIT: 56,
     IOS_TOP_LANDSCAPE: 32,
     IOS_TOP_PORTRAIT: 64,
+    IOSX_TOP_PORTRAIT: 88,
     STATUS_BAR_HEIGHT: 20
 };
diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js
index f1b1f3bdd..d23973cc9 100644
--- a/app/screens/select_server/select_server.js
+++ b/app/screens/select_server/select_server.js
@@ -183,7 +183,7 @@ class SelectServer extends PureComponent {
     };
 
     onClick = wrapWithPreventDoubleTap(async () => {
-        const preUrl = urlParse(this.props.serverUrl, true);
+        const preUrl = urlParse(this.state.url, true);
         const url = stripTrailingSlashes(preUrl.protocol + '//' + preUrl.host);
 
         Keyboard.dismiss();
diff --git a/yarn.lock b/yarn.lock
index 12538d1d4..c5bdd0005 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3974,7 +3974,7 @@ makeerror@1.0.x:
 
 mattermost-redux@mattermost/mattermost-redux:
   version "1.1.0"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/94861ab29626f54fa8c40a2a6a5fa3f3850c7299"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/b927e62835ef7f0015e4a5f8908f613d3492865d"
   dependencies:
     deep-equal "1.0.1"
     form-data "2.3.1"