diff --git a/shells/zsh/includes/completion.zsh b/shells/zsh/includes/completion.zsh
index 4642f3d8..c20f2eeb 100644
--- a/shells/zsh/includes/completion.zsh
+++ b/shells/zsh/includes/completion.zsh
@@ -20,6 +20,10 @@ zstyle ':completion:*' format ' %F{yellow}-- %d --%f'
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*' verbose yes
 
+# Improve tab completion for encrypt and decrypt funcitons
+zstyle ':completion:*:decrypt:*' file-patterns '*.(pgp|gpg)'
+zstyle ':completion:*:encrypt:*' ignored-patterns '*.(pgp|gpg)'
+
 export LISTMAX=-1
 
 zmodload zsh/complist