diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index 372c13ed4..546f16082 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -1,28 +1,28 @@
 function fish_default_mode_prompt --description "Display vi prompt mode"
     # Do nothing if not in vi mode
-    if test "$fish_key_bindings" = fish_vi_key_bindings
-        or test "$fish_key_bindings" = fish_hybrid_key_bindings
-        switch $fish_bind_mode
-            case default
-                set_color --bold red
-                echo '[N]'
-            case insert
-                set_color --bold green
-                echo '[I]'
-            case replace_one
-                set_color --bold green
-                echo '[R]'
-            case replace
-                set_color --bold cyan
-                echo '[R]'
-            case visual
-                set_color --bold magenta
-                echo '[V]'
-            case operator f F t T
-                set_color --bold cyan
-                echo '[N]'
-        end
-        set_color --reset
-        echo -n ' '
+    if not contains -- "$fish_key_bindings" fish_vi_key_bindings fish_hybrid_key_bindings
+        return
     end
+    switch $fish_bind_mode
+        case default
+            set_color --bold red
+            echo '[N]'
+        case insert
+            set_color --bold green
+            echo '[I]'
+        case replace_one
+            set_color --bold green
+            echo '[R]'
+        case replace
+            set_color --bold cyan
+            echo '[R]'
+        case visual
+            set_color --bold magenta
+            echo '[V]'
+        case operator f F t T
+            set_color --bold cyan
+            echo '[N]'
+    end
+    set_color --reset
+    echo -n ' '
 end