diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index dbd57ebca..958db0c09 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -252,7 +252,7 @@ function __fish_config_interactive -d "Initializations that should be performed
         end
 
         # Disable BP before every command because that might not support it.
-        function __fish_disable_bracketed_paste --on-event fish_preexec --on-process-exit %self
+        function __fish_disable_bracketed_paste --on-event fish_preexec --on-event fish_exit
             printf "\e[?2004l"
         end
 
diff --git a/share/functions/trap.fish b/share/functions/trap.fish
index d6f32c7b2..119cdc1c3 100644
--- a/share/functions/trap.fish
+++ b/share/functions/trap.fish
@@ -8,7 +8,7 @@ end
 function __trap_switch
     switch $argv[1]
         case EXIT exit
-            echo --on-process-exit %self
+            echo --on-event fish_exit
 
         case '*'
             echo --on-signal $argv[1]