diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 0fc0724f..5f558803 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1126,6 +1126,18 @@ def run_hw_tests(state):
     print_warning('Errors encountered posting results to osTicket.')
     print_standard(' ')
 
+  # Upload for review
+  if ENABLED_UPLOAD_DATA and ask('Upload results for review?'):
+    try_and_print(
+      message='Saving debug reports...',
+      function=save_debug_reports,
+      state=state, global_vars=global_vars)
+    try_and_print(
+      message='Uploading Data...',
+      function=upload_logdir,
+      global_vars=global_vars,
+      reason='Review')
+
   # Done
   sleep(1)
   if state.quick_mode:
@@ -1699,17 +1711,6 @@ def show_results(state):
   # Update progress
   update_progress_pane(state)
 
-  # Ask for review
-  if ENABLED_UPLOAD_DATA and ask('Upload results for review?'):
-    try_and_print(
-      message='Saving debug reports...',
-      function=save_debug_reports,
-      state=state, global_vars=global_vars)
-    try_and_print(
-      message='Uploading Data...',
-      function=upload_logdir,
-      global_vars=global_vars)
-
 
 def update_main_options(state, selection, main_options):
   """Update menu and state based on selection."""