diff --git a/completions/7z b/completions/7z
index f2a6ef639d4..8da846a5c58 100644
--- a/completions/7z
+++ b/completions/7z
@@ -6,12 +6,12 @@ _7z()
     _init_completion -n = || return
 
     if ((cword == 1)); then
-        COMPREPLY=($(compgen -W 'a b d e l t u x' -- "$cur"))
+        COMPREPLY=($(compgen -W 'a b d e h i l rn t u x' -- "$cur"))
         return
     fi
 
     local mode
-    [[ ${words[1]} == [adu] ]] && mode=w || mode=r
+    [[ ${words[1]} == @(a|d|rn|u) ]] && mode=w || mode=r
 
     case $cur in
         -ao*)