diff --git a/themes/syl20bnr.zsh-theme b/themes/syl20bnr.zsh-theme
index 03fcfc6c7..9fb9db154 100644
--- a/themes/syl20bnr.zsh-theme
+++ b/themes/syl20bnr.zsh-theme
@@ -47,12 +47,12 @@ INSERT_MODE="-- INSERT --"
 NORMAL_MODE="-- NORMAL --"
 VI_PROMPT=%{$GREEN%}"${INSERT_MODE}"
 function zle-keymap-select {
-    VI_PROMPT="${${KEYMAP/vicmd/${RED}"${NORMAL_MODE}"}/(main|viins)/${GREEN}"${INSERT_MODE}"}"
+    VI_PROMPT="${${KEYMAP/vicmd/${RED}${NORMAL_MODE}}/(main|viins)/${GREEN}${INSERT_MODE}}"
     zle reset-prompt
 }
 
 # Prompt format
 PROMPT='
 %{$BLUE_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
-${VI_PROMPT} ➤ %{$RESET_COLOR%}'
+${VI_PROMPT} ➤%{$RESET_COLOR%} '
 RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'