diff --git a/autocompletion/cheat.zsh b/autocompletion/cheat.zsh
index 0ebec18..be33b0b 100644
--- a/autocompletion/cheat.zsh
+++ b/autocompletion/cheat.zsh
@@ -1,12 +1,5 @@
 #compdef cheat
 
-declare -a cheats cheats_in_this_dir
-
-for directory in $(cheat --cheat_directories); do
-    cheats_in_this_dir=($directory/*(N:r:t))
-    [[ ${#cheats_in_this_dir} > 0 ]] && cheats+=($cheats_in_this_dir)
-done
-
-_arguments "1:cheats:(${cheats})"
-
-return 1
+declare -a cheats
+cheats=$(cheat -l | cut -d' ' -f1)
+_arguments "1:cheats:(${cheats})" && return 0