diff --git a/fish_prompt.fish b/fish_prompt.fish
index 1373133..b0e4896 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -585,7 +585,9 @@ end
 
 function __bobthefish_prompt_vi -S -d 'Display vi mode'
   [ "$theme_display_vi" != 'no' ]; or return
-  [ "$fish_key_bindings" = 'fish_hybrid_key_bindings' -o "$fish_key_bindings" = 'fish_vi_key_bindings' ]; or return
+  [ "$fish_key_bindings" = 'fish_vi_key_bindings' \
+    -o "$fish_key_bindings" = 'fish_hybrid_key_bindings' \
+    -o "$theme_display_vi" = 'force' ]; or return
   switch $fish_bind_mode
     case default
       __bobthefish_start_segment $__color_vi_mode_default