diff --git a/zshrc b/zshrc
index 759f1a2..48708d5 100644
--- a/zshrc
+++ b/zshrc
@@ -150,8 +150,11 @@ fi
 function fzf-history-search() {
   local selected
   selected=$(
-    history | sed 's/ *[0-9]* *//' |
-    fzf --layout=reverse --tac --info=hidden --border=rounded --height=50%
+    cat $HISTFILE |         # get entire history
+    sed 's/ *[0-9]* *//' |  # remove cruft
+    awk '!seen[$0]++' |     # remove duplicates
+    fzf --layout=reverse --tac --cycle  --info=hidden \
+        --border=rounded --height=50%
   )
   if [[ -n "$selected" ]]; then
     BUFFER="$selected"