diff --git a/.gitmodules b/.gitmodules
index d442d86..d35d0bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "themes/base16-kitty"]
 	path = themes/base16-kitty
 	url = https://github.com/kdrag0n/base16-kitty
+[submodule "zsh-autosuggestions"]
+	path = zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions
diff --git a/zsh-autosuggestions b/zsh-autosuggestions
new file mode 160000
index 0000000..d43c309
--- /dev/null
+++ b/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit d43c309f888153d6c46d8b6a3a0186f4148680fd
diff --git a/zshrc b/zshrc
index 58b11fa..2a8d7ac 100644
--- a/zshrc
+++ b/zshrc
@@ -213,5 +213,7 @@ bindkey "[3~" delete-char
 bindkey "^[[Z" reverse-menu-complete
 
 
+ZSH_AUTOSUGGEST_STRATEGY=(history completion)
+source "${RC_PATH}/zsh-autosuggestions/zsh-autosuggestions.zsh"
 # ZSH syntax highlighting : /!\ keep at the bottom !
 source "${RC_PATH}/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh"