diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index b7a75d9ce..7de8c6750 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -9,12 +9,18 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
       if set -q KONSOLE_PROFILE_NAME
         set fcn __fish_cursor_konsole
         set uses_echo 1
-      else if set -q XTERM_LOCALE
+      else if string match -q "xterm*" -- $TERM
         set fcn __fish_cursor_xterm
         set uses_echo 1
       else
         return 1
       end
+    case konsole
+      set fcn __fish_cursor_konsole
+      set uses_echo 1
+    case xterm
+      set fcn __fish_cursor_xterm
+      set uses_echo 1
   end
 
   set -l tmux_prefix