diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index edd8f1846..7ce460c0d 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -232,12 +232,14 @@ function __fish_config_interactive -d "Initializations that should be performed
 			function fish_command_not_found_handler --on-event fish_command_not_found
 				/usr/lib/command-not-found $argv
 			end
+			fish_command_not_found_handler $argv
 		else
 			# Ubuntu Feisty places this command in the regular path instead
 			if type -p command-not-found > /dev/null 2> /dev/null
 				function fish_command_not_found_handler --on-event fish_command_not_found
 					command-not-found $argv
 				end
+				fish_command_not_found_handler $argv
 			end
 		end
 	end