diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 001737eb..f30078d9 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -60,7 +60,7 @@ def get_status_color(s):
         color = COLORS['GREEN']
     return color
 
-def menu_diags():
+def menu_diags(*args):
     diag_modes = [
         {'Name': 'All tests',
             'Tests': ['Prime95', 'NVMe/SMART', 'badblocks']},
@@ -83,6 +83,11 @@ def menu_diags():
         {'Letter': 'Q', 'Name': 'Quit', 'CRLF': True},
         ]
 
+    # Quick disk check
+    if 'quick' in args:
+        run_tests(['Quick', 'NVMe/SMART'])
+        exit_script()
+
     # Show menu
     while True:
         selection = menu_select(
diff --git a/.bin/Scripts/hw-diags b/.bin/Scripts/hw-diags
index 4ce5afdc..c1d7d3ca 100755
--- a/.bin/Scripts/hw-diags
+++ b/.bin/Scripts/hw-diags
@@ -39,5 +39,5 @@ if tmux list-session | grep -q "$SESSION_NAME"; then
 fi
 
 # Start session
-tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU"
+tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU" $*
 
diff --git a/.bin/Scripts/hw-diags-menu b/.bin/Scripts/hw-diags-menu
index cbd4b3b2..f7c1739c 100755
--- a/.bin/Scripts/hw-diags-menu
+++ b/.bin/Scripts/hw-diags-menu
@@ -17,7 +17,7 @@ if __name__ == '__main__':
         clear_screen()
 
         # Show menu
-        menu_diags()
+        menu_diags(*sys.argv)
         
         # Done
         #print_standard('\nDone.')
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/i3/config b/.linux_items/include/live/airootfs/etc/skel/.config/i3/config
index 59b798cf..c136b3f7 100644
--- a/.linux_items/include/live/airootfs/etc/skel/.config/i3/config
+++ b/.linux_items/include/live/airootfs/etc/skel/.config/i3/config
@@ -72,7 +72,7 @@ bindsym $mod+d exec "urxvt -title 'Hardware Diagnostics' -e hw-diags"
 bindsym $mod+f exec "thunar ~"
 bindsym $mod+i exec "hardinfo"
 bindsym $mod+m exec "urxvt -title 'Mount All Volumes' -e mount-all-volumes foh"
-bindsym $mod+s exec "urxvt -title 'Hardware Diagnostics' -e hw-diags foh"
+bindsym $mod+s exec "urxvt -title 'Hardware Diagnostics' -e hw-diags quick"
 bindsym $mod+t exec "urxvt"
 bindsym $mod+v exec "urxvt -title 'Hardware Sensors' -e watch -c -n1 -t hw-sensors"
 bindsym $mod+w exec "firefox"
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
index f1056533..6521d979 100644
--- a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
+++ b/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
@@ -324,7 +324,7 @@
     </keybind>
     <keybind key="W-s">
       <action name="Execute">
-        <command>urxvt -title "Hardware Diagnostics" -e hw-diags foh</command>
+        <command>urxvt -title "Hardware Diagnostics" -e hw-diags quick</command>
       </action>
     </keybind>
     <keybind key="W-t">