diff --git a/src/App.js b/src/App.js
index b05a4a5..5a99932 100644
--- a/src/App.js
+++ b/src/App.js
@@ -131,12 +131,6 @@ class App extends IPCContainer {
     });
   };
 
-  getSelectedVersion = () => {
-    return (this.props.ReleaseVersion === -1) ?
-      'unavailable' :
-      this.props.VersionLookup[Constants.RELEASE_TYPES[this.props.Release]][this.props.ReleaseVersion];
-  };
-
   detectUpgrades = () => {
     if (this.props.AppPlatform !== 'unknown') {
       this.props.loadReleases();
@@ -144,6 +138,12 @@ class App extends IPCContainer {
     }
   };
 
+  getSelectedVersion = () => {
+    return (this.props.ReleaseVersion === -1) ?
+      'unavailable' :
+      this.props.VersionLookup[Constants.RELEASE_TYPES[this.props.Release]][this.props.ReleaseVersion];
+  };
+
   handleDependencyDownload = (url) => {
     this.setState({
       DownloadActive: true,
diff --git a/src/containers/MountItems/MountItems.js b/src/containers/MountItems/MountItems.js
index 7fe1399..8b18b31 100644
--- a/src/containers/MountItems/MountItems.js
+++ b/src/containers/MountItems/MountItems.js
@@ -24,8 +24,6 @@ class MountItems extends IPCContainer {
     this.setRequestHandler(Constants.IPC_Detect_Mounts_Reply, this.onDetectMountsReply);
     this.setRequestHandler(Constants.IPC_Mount_Drive_Reply, this.onMountDriveReply);
     this.setRequestHandler(Constants.IPC_Unmount_Drive_Reply, this.onUnmountDriveReply);
-
-    this.detectMounts();
   }
 
   retryIntervals = {};
@@ -56,6 +54,10 @@ class MountItems extends IPCContainer {
     }
   };
 
+  componentDidMount() {
+    this.detectMounts();
+  }
+
   componentWillUnmount() {
     for (const provider in this.state.RetryItems) {
       if (this.state.RetryItems.hasOwnProperty(provider)) {