diff --git a/src/js/views/Wallet/components/LeftNavigation/index.js b/src/js/views/Wallet/components/LeftNavigation/index.js
index ee2964cd..18335185 100644
--- a/src/js/views/Wallet/components/LeftNavigation/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/index.js
@@ -44,6 +44,7 @@ class LeftNavigation extends Component {
     componentWillReceiveProps() {
         const { selectedDevice } = this.props.wallet;
         const hasFeatures = selectedDevice && selectedDevice.features;
+        const deviceReady = hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized;
 
         if (this.props.deviceDropdownOpened) {
             this.setState({ shouldRenderDeviceSelection: true });
@@ -52,7 +53,7 @@ class LeftNavigation extends Component {
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-left',
             });
-        } else if (selectedDevice && hasFeatures && !selectedDevice.features.bootloader_mode && selectedDevice.features.initialized) {
+        } else if (deviceReady) {
             this.setState({
                 shouldRenderDeviceSelection: false,
                 animationType: 'slide-right',