diff --git a/docs/changelog.rst b/docs/changelog.rst
index 68cbdc269d..fe8eb9ccb9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -101,6 +101,8 @@ Detailed list of changes
 
 - Cursor trails: Fix pure vertical movement sometimes not triggering a trail and holding down a key in nvim causing the trail to be glitchy (:pull:`8152`, :pull:`8153`)
 
+- macOS: Fix mouse cursor shape not always being reset to text cursor when mouse re-enters kitty (:iss:`8155`)
+
 
 0.38.0 [2024-12-15]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m
index e73bf0a17d..79e4104a14 100644
--- a/glfw/cocoa_window.m
+++ b/glfw/cocoa_window.m
@@ -940,6 +940,7 @@ - (void)mouseExited:(NSEvent *)event
     (void)event;
     if (!window) return;
     _glfwInputCursorEnter(window, false);
+    [[NSCursor arrowCursor] set];
 }
 
 - (void)mouseEntered:(NSEvent *)event
@@ -947,6 +948,7 @@ - (void)mouseEntered:(NSEvent *)event
     (void)event;
     if (!window) return;
     _glfwInputCursorEnter(window, true);
+    updateCursorImage(window);
 }
 
 - (void)viewDidChangeEffectiveAppearance