diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 7e7b86db4..196e706ea 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -18,7 +18,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         __fish_vi_cursor fish_cursor_$fish_bind_mode
     end
 
-    function fish_vi_cursor_handle_preexec --on-event fish_preexec
+    function fish_vi_cursor_handle_preexec --on-event fish_preexec --on-event fish_exit
         set -l varname fish_cursor_external
         if not set -q \$varname
             set varname fish_cursor_default