diff --git a/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish b/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
index 7042f892a..f745bbb13 100644
--- a/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
+++ b/src/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish
@@ -54,10 +54,14 @@ function __ghostty_setup --on-event fish_prompt -d "Setup ghostty integration"
     if contains cursor $features
         # Change the cursor to a beam on prompt.
         function __ghostty_set_cursor_beam --on-event fish_prompt -d "Set cursor shape"
-            echo -en "\e[5 q"
+            if not functions -q fish_vi_cursor_handle
+                echo -en "\e[5 q"
+            end
         end
         function __ghostty_reset_cursor --on-event fish_preexec -d "Reset cursor shape"
-            echo -en "\e[0 q"
+            if not functions -q fish_vi_cursor_handle
+                echo -en "\e[0 q"
+            end
         end
     end