diff --git a/docs/keyboard-protocol.rst b/docs/keyboard-protocol.rst
index 14e96419e..066b79e92 100644
--- a/docs/keyboard-protocol.rst
+++ b/docs/keyboard-protocol.rst
@@ -52,6 +52,7 @@ In addition to kitty, this protocol is also implemented in:
 * The `yazi file manager <https://github.com/sxyazi/yazi>`__
 * The `awrit web browser <https://github.com/chase/awrit>`__
 * The `nushell shell <https://github.com/nushell/nushell/pull/10540>`__
+* The `fish shell <https://github.com/fish-shell/fish-shell/commit/8bf8b10f685d964101f491b9cc3da04117a308b4>`__
 
 .. versionadded:: 0.20.0
 
diff --git a/docs/shell-integration.rst b/docs/shell-integration.rst
index 3a9b816e0..da85ee066 100644
--- a/docs/shell-integration.rst
+++ b/docs/shell-integration.rst
@@ -85,6 +85,8 @@ no-cwd
 no-prompt-mark
     Turn off marking of prompts. This disables jumping to prompt, browsing
     output of last command and click to move cursor functionality.
+    Note that for the fish shell this does not take effect, since fish always
+    marks prompts.
 
 no-complete
     Turn off completion for the kitty command.
diff --git a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
index a074d2639..005d5b296 100644
--- a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
+++ b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
@@ -71,27 +71,32 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after
 
     # Enable prompt marking with OSC 133
     if not contains "no-prompt-mark" $_ksi and not set -q __ksi_prompt_state
-        function __ksi_mark_prompt_start --on-event fish_prompt --on-event fish_cancel --on-event fish_posterror
-            test "$__ksi_prompt_state" != prompt-start
-            and echo -en "\e]133;D\a"
-            set --global __ksi_prompt_state prompt-start
-            echo -en "\e]133;A;special_key=1\a"
-        end
-        __ksi_mark_prompt_start
+        # fish 3.8 emits prompt markers, so we don't need to.
+        # Cheesily detect that version by probing for another feature.
+        if not bind --function-names | string match -q forward-char-passive
+            function __ksi_mark_prompt_start --on-event fish_prompt --on-event fish_cancel --on-event fish_posterror
+                test "$__ksi_prompt_state" != prompt-start
+                and echo -en "\e]133;D\a"
+                set --global __ksi_prompt_state prompt-start
+                echo -en "\e]133;A;special_key=1\a"
+            end
+            __ksi_mark_prompt_start
 
-        function __ksi_mark_output_start --on-event fish_preexec
-            set --global __ksi_prompt_state pre-exec
-            echo -en "\e]133;C\a"
+            function __ksi_mark_output_start --on-event fish_preexec
+                set --global __ksi_prompt_state pre-exec
+                echo -en "\e]133;C\a"
+            end
+
+            function __ksi_mark_output_end --on-event fish_postexec
+                set --global __ksi_prompt_state post-exec
+                echo -en "\e]133;D;$status\a"
+            end
+
+            # With prompt marking, kitty clears the current prompt on resize,
+            # so we need fish to redraw it.
+            set --global fish_handle_reflow 1
         end
 
-        function __ksi_mark_output_end --on-event fish_postexec
-            set --global __ksi_prompt_state post-exec
-            echo -en "\e]133;D;$status\a"
-        end
-
-        # With prompt marking, kitty clears the current prompt on resize,
-        # so we need fish to redraw it.
-        set --global fish_handle_reflow 1
         # Binding for special key to move cursor on mouse click without triggering any
         # autocompletion or other effects
         set --local suffix ''