diff --git a/CHANGELIST.md b/CHANGELIST.md
index 56f47a97..14f2b17e 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -119,6 +119,7 @@
 - More pendantic GUI changes
 - Remove unused progress bar
 - Disable all UI elements on protect scan
+- Account for menu items for disable/enable
 
 ### 3.2.4 (2024-11-24)
 
diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs
index a7732e0a..74d32077 100644
--- a/MPF.Frontend/ViewModels/MainViewModel.cs
+++ b/MPF.Frontend/ViewModels/MainViewModel.cs
@@ -1824,6 +1824,10 @@ namespace MPF.Frontend.ViewModels
             Status = "Scanning for copy protection... this might take a while!";
 
             // Disable UI elements
+            OptionsMenuItemEnabled = false;
+            CheckDumpMenuItemEnabled = false;
+            CreateIRDMenuItemEnabled = false;
+
             SystemTypeComboBoxEnabled = false;
             MediaTypeComboBoxEnabled = false;
 
@@ -1861,6 +1865,10 @@ namespace MPF.Frontend.ViewModels
                 Status = tempContent;
 
                 // Enable UI elements
+                OptionsMenuItemEnabled = true;
+                CheckDumpMenuItemEnabled = true;
+                CreateIRDMenuItemEnabled = true;
+
                 SystemTypeComboBoxEnabled = true;
                 MediaTypeComboBoxEnabled = true;
 
@@ -2132,6 +2140,8 @@ namespace MPF.Frontend.ViewModels
         {
             if (ParametersCheckBoxEnabled == false)
             {
+                OptionsMenuItemEnabled = false;
+
                 SystemTypeComboBoxEnabled = false;
                 MediaTypeComboBoxEnabled = false;
 
@@ -2150,6 +2160,8 @@ namespace MPF.Frontend.ViewModels
             {
                 ProcessCustomParameters();
 
+                OptionsMenuItemEnabled = true;
+
                 SystemTypeComboBoxEnabled = true;
                 MediaTypeComboBoxEnabled = true;