diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4850bae64..289634e9c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -24,7 +24,8 @@ Scripting improvements
 
 Interactive improvements
 ------------------------
-Vi mode cursors are now set properly after control-C. (:issue:`8125`).
+- vi mode cursors are now set properly after control-C. (:issue:`8125`).
+- vi mode cursors are enabled in Apple Terminal (:issue:`8167`).
 
 New or improved bindings
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 5b30590fb..1e7728ce0 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -46,6 +46,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
             and not set -q VTE_VERSION # which version is already checked above
             and not set -q WT_PROFILE_ID
             and not set -q XTERM_VERSION
+            and not string match -q "Apple_Terminal" -- $TERM_PROGRAM
             and not string match -rq '^st(-.*)$' -- $TERM
             and not string match -q 'xterm-kitty*' -- $TERM
             and not string match -q 'rxvt*' -- $TERM