diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index fae78b21..1b1d2ae5 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -366,6 +366,8 @@ class DiskObj():
     # Attributes
     if 'NVMe / SMART' not in self.tests:
       report.extend(self.generate_attribute_report())
+    elif not self.tests['NVMe / SMART'].report:
+      report.extend(self.generate_attribute_report())
 
     # Tests
     for test in self.tests.values():
@@ -1592,6 +1594,9 @@ def show_results(state):
       show_report(disk.generate_disk_report(), log_report=True)
       print_standard(' ')
 
+  # Update progress
+  update_progress_pane(state)
+
 
 def update_main_options(state, selection, main_options):
   """Update menu and state based on selection."""