diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index 64919f64..f1aaa2b4 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -3440,7 +3440,7 @@ function _p9k_dump_state() {
   sysopen -a -m 600 -o creat,trunc -u fd $tmp || return
   {
     local include='_POWERLEVEL9K_*|_p9k_*|icons|OS|DEFAULT_COLOR|DEFAULT_COLOR_INVERTED'
-    local exclude='_p9k_gitstatus_*|_p9k_cache_stat_meta|_p9k_cache_stat_fprint|_p9k_cache_fprint_key|_p9k_param_sig|_p9k_public_ip|_p9k_prompt|_p9k_prompt_idx|_p9k_dump_pid|_p9k_dump_scheduled|_p9k_async_pump_*'
+    local exclude='_p9k_gitstatus_*|_p9k_cache_stat_meta|_p9k_cache_stat_fprint|_p9k_cache_fprint_key|_p9k_param_sig|_p9k_public_ip|_p9k_prompt|_p9k_prompt_idx|_p9k_dump_pid|_p9k_dump_scheduled|_p9k_line_finished|_p9k_preexec_cmd|_p9k_status|_p9k_pipestatus|_p9k_timer_start|_p9k_region_active|_p9k_keymap|_p9k_zle_state|_p9k_async_pump_*'
     typeset -g __p9k_cached_param_sig=$_p9k_param_sig
     typeset -p __p9k_cached_param_sig >&$fd || return
     unset __p9k_cached_param_sig
@@ -4411,10 +4411,6 @@ _p9k_init_prompt() {
   [[ -o transient_rprompt && -n "$_p9k_line_segments_right[1,-2]" ]] ||
      ( _p9k_segment_in_use time && (( _POWERLEVEL9K_TIME_UPDATE_ON_COMMAND )) )
   _p9k_reset_on_line_finish=$((!$?))
-
-  if (( _p9k_reset_on_line_finish )) || _p9k_segment_in_use status; then
-    _p9k_wrap_zle_widget zle-line-finish _p9k_zle_line_finish
-  fi
 }
 
 _p9k_init_ssh() {
@@ -4454,7 +4450,7 @@ _p9k_must_init() {
     '${ZSH_VERSION}' '${ZSH_PATCHLEVEL}' '${(%):-%n}' '${GITSTATUS_LOG_LEVEL}'
     '${GITSTATUS_ENABLE_LOGGING}' '${GITSTATUS_DAEMON}' '${GITSTATUS_NUM_THREADS}'
     '${DEFAULT_USER}' '${ZLE_RPROMPT_INDENT}' '${P9K_SSH}' '${__p9k_ksh_arrays}'
-    '${__p9k_sh_glob}' '${parameters[transient_rprompt]}' 'v6')
+    '${__p9k_sh_glob}' '${parameters[transient_rprompt]}' 'v7')
   IFS=$'\2' param_sig="${(e)param_sig}"
   [[ $param_sig == $_p9k_param_sig ]] && return 1
   [[ -n $_p9k_param_sig ]] && _p9k_deinit
@@ -4714,6 +4710,10 @@ _p9k_init() {
     fi
   fi
 
+  if (( _p9k_reset_on_line_finish )) || _p9k_segment_in_use status; then
+    _p9k_wrap_zle_widget zle-line-finish _p9k_zle_line_finish
+  fi
+
   if _p9k_segment_in_use vi_mode || _p9k_segment_in_use prompt_char; then
     _p9k_wrap_zle_widget zle-keymap-select _p9k_zle_keymap_select
   fi