diff --git a/shells/zsh/completion/_hashcat b/shells/zsh/completion/_hashcat
index 0a57204a..8fc86b93 100644
--- a/shells/zsh/completion/_hashcat
+++ b/shells/zsh/completion/_hashcat
@@ -27,7 +27,7 @@ _hashes(){
 	if $(type fzf > /dev/null); then
 		# If fzf if available, use it for hash completion
 
-		hashcat --example-hashes | awk -v RS="\n\n" -F "\t" '{gsub("\n","\t",$0); print $1 "\t" $2 "\t" $3}' | sed 's/MODE: //; s/TYPE: //' | fzf -d "\t" --header="Mode	Type" --with-nth='1,2' --preview='echo {3}' --preview-window=up:1 | cut -d'	' -f1
+		hashcat --example-hashes | grep -E '(mode|Example\.Hash\.\.|Name|^$)' | awk -F ': ' '{print $NF}' | sed 's/Hash mode #//' | awk -v RS="\n\n" -F="\t" '{gsub("\n","\t",$0);print $0}' | fzf -d "\t" --header="Mode Type" --with-nth='1,2' --preview='echo {3}' --preview-window=up:1 --height=40% | cut -d'	' -f1
 	else
 		hashcat --example-hashes | awk -v RS="\n\n" -F "\t" '{gsub("\n","\t",$0); print $1 ":" $2 }' | sed 's/MODE: //; s/TYPE: //'
 	fi