diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index ee80274..0c54b76 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -146,6 +146,9 @@ export default class HomeScreen extends React.Component {
   }
 
   componentDidUpdate(prevProps, prevState) {
+    if (typeof this.props.navigation.state.params.activeServer != 'undefined') {
+      this.bootstrapAsync();
+    }
     if (prevState.isFullscreen !== this.state.isFullscreen) {
       // Update the screen orientation
       this.updateScreenOrientation();
@@ -158,12 +161,6 @@ export default class HomeScreen extends React.Component {
     }
   }
 
-  componentWillReceiveProps(nextProps) {
-    if (typeof nextProps.navigation.state.params.activeServer != 'undefined') {
-      this.bootstrapAsync();
-    }
-  }
-
   render() {
     // Hide webview until loaded
     const webviewStyle = (this.state.isError || this.state.isLoading) ?