diff --git a/scripts/auto_repairs.py b/scripts/auto_repairs.py
index 6a28e49b..2da57e6a 100644
--- a/scripts/auto_repairs.py
+++ b/scripts/auto_repairs.py
@@ -76,6 +76,7 @@ BASE_MENUS = {
     },
   'Options': (
     MenuEntry('Kill Explorer', selected=False),
+    MenuEntry('Run AVRemover (once)'),
     MenuEntry('Run RKill'),
     MenuEntry('Sync Clock'),
     MenuEntry('Use Autologon', selected=False),
@@ -90,6 +91,7 @@ BASE_MENUS = {
 PRESETS = {
   'Default': { # Will be expanded at runtime using BASE_MENUS
     'Options': (
+      'Run AVRemover (once)',
       'Run RKill',
       'Sync Clock',
       ),
@@ -170,6 +172,7 @@ PRESETS = {
       'Enable Windows Updates',
       ),
     'Options': (
+      'Run AVRemover (once)',
       'Run RKill',
       'Sync Clock',
       ),
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 8416dd90..31680780 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -338,10 +338,11 @@ def init_session(options) -> None:
     set_timezone(WINDOWS_TIME_ZONE)
 
   # One-time tasks
-  TRY_PRINT.run(
-    'Run AVRemover...', run_tool, 'AVRemover', 'AVRemover',
-    download=True, msg_good='DONE',
-    )
+  if options['Run AVRemover (once)']['Selected']:
+    TRY_PRINT.run(
+      'Run AVRemover...', run_tool, 'AVRemover', 'AVRemover',
+      download=True, msg_good='DONE',
+      )
   print('')