diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh
index 18aa0e2..b85aece 100644
--- a/home/.config/zsh/01-env.zsh
+++ b/home/.config/zsh/01-env.zsh
@@ -73,8 +73,3 @@ fi
 
 # Disable dotdrop submodule auto update
 export DOTDROP_AUTOUPDATE=no
-
-{%@@ if os == "arch" @@%}
-# Enable pkgfile command not found handler
-source /usr/share/doc/pkgfile/command-not-found.zsh
-{%@@ endif @@%}
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index 846323f..e588df8 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -12,9 +12,13 @@ forgit_revert_commit=fgrc
 # Modern replacement for ls
 alias ls='exa'
 
-{%@@ if os == "termux" @@%}
+# Enable command not found handler
+{%@@ if os == "arch" @@%}
+source /usr/share/doc/pkgfile/command-not-found.zsh
+{%@@ elif os == "ubuntu" @@%}
+source /etc/zsh_command_not_found
+{%@@ elif os == "termux" @@%}
 function command_not_found_handler {
-    printf 'zsh: command not found: %s\n' "$1"
 	$PREFIX/libexec/termux/command-not-found $1
 }
 {%@@ endif @@%}