diff --git a/UI/Tabs/DownloadViewModel.cs b/UI/Tabs/DownloadViewModel.cs
index 700c9c7c..d19aa0ff 100644
--- a/UI/Tabs/DownloadViewModel.cs
+++ b/UI/Tabs/DownloadViewModel.cs
@@ -346,9 +346,11 @@ private void CopyComplete()
 
             DownloadInfo = LanguageManager.GetValue("String.Completed");
             ApplicationManager.Instance.IsDownloading = false;
-            
             Application.Current.Dispatcher.Invoke(() =>
             {
+                USBHelper.GenerateLog(Log, MessageBox.MessageBox.Show(LanguageManager.GetValue("MessageBox.UploadLog"), "Syn3 Updater", MessageBoxButton.YesNo,
+                    MessageBoxImage.Information) == MessageBoxResult.Yes);
+
                 if (_action == "main")
                 {
                     if (MessageBox.MessageBox.Show(LanguageManager.GetValue("MessageBox.UpdateCurrentversion"), "Syn3 Updater", MessageBoxButton.YesNo,
@@ -376,8 +378,6 @@ private void CopyComplete()
 
                
             });
-            USBHelper.GenerateLog(Log, MessageBox.MessageBox.Show(LanguageManager.GetValue("MessageBox.UploadLog"), "Syn3 Updater", MessageBoxButton.YesNo,
-                MessageBoxImage.Information) == MessageBoxResult.Yes);
             Reset();
         }
 
diff --git a/UI/Tabs/HomeViewModel.cs b/UI/Tabs/HomeViewModel.cs
index be3f7598..c82469d0 100644
--- a/UI/Tabs/HomeViewModel.cs
+++ b/UI/Tabs/HomeViewModel.cs
@@ -305,7 +305,7 @@ private void UpdateDriveInfo()
             // Update app level vars
             ApplicationManager.Instance.DriveFileSystem = driveInfo.FileSystem;
             ApplicationManager.Instance.DrivePartitionType = driveInfo.PartitionType;
-            ApplicationManager.Instance.DriveName = driveInfo.Name;
+            ApplicationManager.Instance.DriveName =  SelectedDrive?.Name;
             ApplicationManager.Instance.SkipFormat = driveInfo.SkipFormat;
 
             // Update local level vars