diff --git a/.gitmodules b/.gitmodules
index 43216e51..2e09b880 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "common/.config/zsh/plugins/fzf-tab"]
 	path = common/.config/zsh/plugins/fzf-tab
 	url = https://github.com/Aloxaf/fzf-tab
+[submodule "common/.config/zsh/plugins/zsh-defer"]
+	path = common/.config/zsh/plugins/zsh-defer
+	url = https://github.com/romkatv/zsh-defer
diff --git a/common/.config/zsh/.zshrc b/common/.config/zsh/.zshrc
index c9f78bbb..73eeee3e 100644
--- a/common/.config/zsh/.zshrc
+++ b/common/.config/zsh/.zshrc
@@ -1,12 +1,17 @@
 #!/bin/zsh
 
+source "$ZDOTDIR"/plugins/zsh-defer/zsh-defer.plugin.zsh
+
+for f in "$ZDOTDIR"/configs/*; do
+    source "$f"
+done
+
 for f in \
-    "$ZDOTDIR"/configs/* \
     "$ZDOTDIR"/plugins/*/*.plugin.zsh \
     /usr/share/zsh/plugins/*/*.plugin.zsh \
     /usr/share/fzf/*.zsh
 do
-    source $f
+    [ "$f" != "${ZDOTDIR}/plugins/zsh-defer.plugin.zsh" ] && zsh-defer source $f
 done
 
 export GPG_TTY="$(tty)"
diff --git a/common/.config/zsh/plugins/zsh-defer b/common/.config/zsh/plugins/zsh-defer
new file mode 160000
index 00000000..53a26e28
--- /dev/null
+++ b/common/.config/zsh/plugins/zsh-defer
@@ -0,0 +1 @@
+Subproject commit 53a26e287fbbe2dcebb3aa1801546c6de32416fa