diff --git a/app/actions/navigation.js b/app/actions/navigation.js
index b206b1e3b..32702f58b 100644
--- a/app/actions/navigation.js
+++ b/app/actions/navigation.js
@@ -16,6 +16,9 @@ export function resetToChannel() {
                         component: {
                             name: 'Channel',
                             options: {
+                                statusBar: {
+                                    visible: true,
+                                },
                                 topBar: {
                                     backButton: {
                                         color: theme.sidebarHeaderTextColor,
@@ -24,13 +27,11 @@ export function resetToChannel() {
                                     background: {
                                         color: theme.sidebarHeaderBg,
                                     },
-                                    statusBar: {
-                                        visible: true,
-                                    },
                                     title: {
                                         color: theme.sidebarHeaderTextColor,
                                     },
                                     visible: false,
+                                    height: 0,
                                 },
                             },
                         },
@@ -55,6 +56,9 @@ export function resetToSelectServer(allowOtherServers) {
                                 allowOtherServers,
                             },
                             options: {
+                                statusBar: {
+                                    visible: true,
+                                },
                                 topBar: {
                                     backButton: {
                                         color: theme.sidebarHeaderTextColor,
@@ -63,10 +67,8 @@ export function resetToSelectServer(allowOtherServers) {
                                     background: {
                                         color: theme.sidebarHeaderBg,
                                     },
-                                    statusBar: {
-                                        visible: true,
-                                    },
                                     visible: false,
+                                    height: 0,
                                 },
                             },
                         },
diff --git a/app/mattermost.js b/app/mattermost.js
index 4446484bf..3cc7772ba 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -465,6 +465,7 @@ const launchEntry = () => {
                         },
                         topBar: {
                             visible: false,
+                            height: 0,
                         },
                     },
                 },
diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js
index 7d77448dd..6dc4cfc02 100644
--- a/app/screens/select_server/select_server.js
+++ b/app/screens/select_server/select_server.js
@@ -178,6 +178,7 @@ export default class SelectServer extends PureComponent {
                             text: title,
                         },
                         visible: !LocalConfig.AutoSelectServerUrl,
+                        height: LocalConfig.AutoSelectServerUrl ? 0 : null,
                     },
                 },
             },