diff --git a/fish_prompt.fish b/fish_prompt.fish
index 5526698..c21bf03 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -577,7 +577,8 @@ function __bobthefish_prompt_dir -S -d 'Display a shortened form of the current
 end
 
 function __bobthefish_prompt_vi -S -d 'Display vi mode'
-  [ "$theme_display_vi" != 'no' -a "$fish_key_bindings" = 'fish_vi_key_bindings' ]; or return
+  [ "$theme_display_vi" != 'no' ]; or return
+  [ "$fish_key_bindings" = 'fish_hybrid_key_bindings' -o "$fish_key_bindings" = 'fish_vi_key_bindings' ]; or return
   switch $fish_bind_mode
     case default
       __bobthefish_start_segment $__color_vi_mode_default