diff --git a/modules/prompt/themes/steeef.zsh-theme b/modules/prompt/themes/steeef.zsh-theme
index 0d44159..6feb71e 100644
--- a/modules/prompt/themes/steeef.zsh-theme
+++ b/modules/prompt/themes/steeef.zsh-theme
@@ -45,6 +45,11 @@ prompt_steeef_precmd() {
 %(!.#.$) '
 }
 
+function zle-line-init zle-keymap-select {
+  RPROMPT="${${KEYMAP/vicmd/--NORMAL--}/(main|viins)/}"
+  zle reset-prompt
+}
+
 prompt_steeef_setup() {
   #use extended color pallete if available
   if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
@@ -93,6 +98,9 @@ prompt_steeef_setup() {
   autoload -Uz vcs_info
   autoload -Uz colors && colors
 
+  zle -N zle-line-init
+  zle -N zle-keymap-select
+
   add-zsh-hook preexec steeef_preexec
   add-zsh-hook chpwd steeef_chpwd
   add-zsh-hook precmd prompt_steeef_precmd