diff --git a/picard/__init__.py b/picard/__init__.py
index b392f2c62..3ac1b0490 100644
--- a/picard/__init__.py
+++ b/picard/__init__.py
@@ -99,7 +99,7 @@ def crash_handler():
     import sys
 
     # Allow disabling the graphical crash handler for debugging and CI purposes.
-    if '--no-crash-dialog' in sys.argv:
+    if set(sys.argv) & {'--no-crash-dialog', '-v', '--version', '-V', '--long-version', '-h', '--help'}:
         return
 
     # First try to get traceback information and write it to a log file