diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 292bff3e..b6b25ebf 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -275,9 +275,9 @@ def build_menu(cli_mode=False, quick_mode=False) -> cli.Menu:
 
   # Update default selections for quick mode if necessary
   if quick_mode:
-    for name in menu.options:
+    for name, details in menu.options.items():
       # Only select quick option(s)
-      menu.options[name]['Selected'] = name in MENU_OPTIONS_QUICK
+      details['Selected'] = name in MENU_OPTIONS_QUICK
 
   # Skip CPU tests for TestStations
   if os.path.exists(cfg.hw.TESTSTATION_FILE):