diff --git a/CHANGELIST.md b/CHANGELIST.md
index 90bfd714..3c182d06 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -9,6 +9,7 @@
 - Return full result from dump checks
 - Fix logic from around Macrovision security driver filtering
 - Remove SkipMediaTypeDetection option, cleanup options window
+- Minor tweaks to frontend code
 
 ### 3.4.0 (2025-09-25)
 
diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs
index 2c4621d4..caef70ed 100644
--- a/MPF.Frontend/ViewModels/MainViewModel.cs
+++ b/MPF.Frontend/ViewModels/MainViewModel.cs
@@ -674,7 +674,7 @@ namespace MPF.Frontend.ViewModels
 
                 // Set the selected index
                 CurrentDrive = (index != -1 ? Drives[index] : Drives[0]);
-                Status = "Valid drive found! Choose your Media Type";
+                Status = "Valid drive found!";
                 CopyProtectScanButtonEnabled = true;
 
                 // Get the current system type
@@ -1359,6 +1359,10 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         public void EnsureMediaInformation()
         {
+            // If the drive list is empty, ignore updates
+            if (Drives.Count == 0)
+                return;
+
             // Get the current environment information
             _environment = DetermineEnvironment();
 
@@ -2112,8 +2116,7 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         private bool ShouldEnableDumpingButton()
         {
-            return Drives != null
-                && Drives.Count > 0
+            return Drives.Count > 0
                 && CurrentSystem != null
                 && CurrentMediaType != null
                 && ProgramSupportsMedia();