diff --git a/zsh/.config/zsh/01_exports.zsh b/zsh/.config/zsh/01_exports.zsh
index 6096e72..c00cb00 100644
--- a/zsh/.config/zsh/01_exports.zsh
+++ b/zsh/.config/zsh/01_exports.zsh
@@ -1,8 +1,9 @@
 # History
 mkdir -p "${XDG_STATE_HOME}/zsh"
 HISTFILE="${XDG_STATE_HOME}/zsh/history"
-HISTSIZE=2000
-SAVEHIST=1000
+HISTSIZE=1000000
+SAVEHIST=$HISTSIZE
+setopt EXTENDED_HISTORY
 
 # Prompt
 setopt PROMPT_SUBST
diff --git a/zsh/.config/zsh/10_completions.zsh b/zsh/.config/zsh/10_completions.zsh
index 28bf88f..bcebd2c 100644
--- a/zsh/.config/zsh/10_completions.zsh
+++ b/zsh/.config/zsh/10_completions.zsh
@@ -2,3 +2,8 @@ fpath+=($XDG_CONFIG_HOME/zsh/completions)
 
 autoload -Uz compinit
 compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+# If we have fzf installed, load its zsh completions
+if [ -x $(command -v fzf) ]; then
+    source <(fzf --zsh)
+fi