diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index fe8041f..9e6966f 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -113,6 +113,7 @@ _comp_options+=(globdots) # Include hidden files
 # Don't complete the same twice for diff/meld (http://leahneukirchen.org/dotfiles/.zshrc)
 zstyle ':completion:*:(diff|meld):*' ignore-line yes
 
+comp-source "$ZSH_CONF/fzf-tab/fzf-tab.plugin.zsh"
 
 ## Load external config files and modules
 autoload edit-command-line; zle -N edit-command-line
@@ -133,7 +134,6 @@ comp-source "$ZSH_CONF/transfer.zsh"
 comp-source "$ZSH_CONF/zsh-autosuggestions/zsh-autosuggestions.zsh"
 comp-source "$ZSH_CONF/completion.zsh"
 # comp-source "$ZSH_CONF/zsh-async/async.zsh"
-comp-source "$ZSH_CONF/fzf/shell/completion.zsh"
 #     async_init
 ### syntax-highlight > history-substring > keys
 # syntax highlighting
@@ -148,6 +148,8 @@ if [ -e "$ZSH_CONF/zsh-history-substring-search/zsh-history-substring-search.zsh
 	HISTORY_SUBSTRING_SEARCH_FUZZY=true
 fi
 comp-source "$ZSH_CONF/keys.zsh"
+# Reenable fzf-tab since `bindkey -v` seems to deactivate it
+enable-fzf-tab
 
 ## Setup PATH
 [[ "$PATH" =~ "$HOME/\.local/bin" ]] || export PATH="$HOME/.local/bin${PATH:+:$PATH}"
diff --git a/.config/zsh/plugins/fzf-tab b/.config/zsh/plugins/fzf-tab
new file mode 160000
index 0000000..4108af7
--- /dev/null
+++ b/.config/zsh/plugins/fzf-tab
@@ -0,0 +1 @@
+Subproject commit 4108af7dc37fc89f59ada74eab79b2037db311fc
diff --git a/.gitmodules b/.gitmodules
index f47dace..e8287af 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,6 +25,9 @@
 [submodule ".config/zsh/plugins/fzf"]
 	path = .config/zsh/plugins/fzf
 	url = https://github.com/junegunn/fzf
+[submodule ".config/zsh/plugins/fzf-tab"]
+	path = .config/zsh/plugins/fzf-tab
+	url = https://github.com/Aloxaf/fzf-tab
 [submodule ".config/zsh/plugins/powerlevel10k"]
 	path = .config/zsh/plugins/powerlevel10k
 	url = https://github.com/romkatv/powerlevel10k.git