diff --git a/scripts/auto_repairs.py b/scripts/auto_repairs.py
index f232c1b3..992e0aed 100644
--- a/scripts/auto_repairs.py
+++ b/scripts/auto_repairs.py
@@ -88,6 +88,8 @@ BASE_MENUS = {
 if __name__ == '__main__':
   try:
     wk.repairs.win.run_auto_repairs(BASE_MENUS)
+  except KeyboardInterrupt:
+    wk.std.abort()
   except SystemExit:
     raise
   except: #pylint: disable=bare-except
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 1b0ded12..47a7cb0a 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -36,6 +36,7 @@ from wk.std           import (
   GenericWarning,
   Menu,
   TryAndPrint,
+  abort,
   ask,
   clear_screen,
   color_string,
@@ -397,7 +398,10 @@ def run_auto_repairs(base_menus):
   for group, menu in menus.items():
     if group in ('Main', 'Options'):
       continue
-    run_group(group, menu)
+    try:
+      run_group(group, menu)
+    except KeyboardInterrupt:
+      abort()
 
   # Done
   end_session()