diff --git a/input.c b/input.c
index 0aef43cc..5f864a8d 100644
--- a/input.c
+++ b/input.c
@@ -1372,7 +1372,7 @@ is_bottom_right(const struct terminal *term, int x, int y)
          (term->active_surface == TERM_SURF_BORDER_BOTTOM && x > term->width + 1 * csd_border_size * term->scale - 10 * term->scale)));
 }
 
-static const char *
+const char *
 xcursor_for_csd_border(struct terminal *term, int x, int y)
 {
     if (is_top_left(term, x, y))                              return XCURSOR_TOP_LEFT_CORNER;
diff --git a/input.h b/input.h
index 68b8719d..5a2c7a67 100644
--- a/input.h
+++ b/input.h
@@ -26,3 +26,5 @@ extern const struct wl_keyboard_listener keyboard_listener;
 extern const struct wl_pointer_listener pointer_listener;
 
 void input_repeat(struct seat *seat, uint32_t key);
+
+const char * xcursor_for_csd_border(struct terminal *term, int x, int y);
diff --git a/terminal.c b/terminal.c
index df8128fc..83204675 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3015,14 +3015,41 @@ term_mouse_motion(struct terminal *term, int button, int row, int col,
 void
 term_xcursor_update_for_seat(struct terminal *term, struct seat *seat)
 {
-    const char *xcursor
-        = seat->pointer.hidden ? XCURSOR_HIDDEN
-        : term->is_searching ? XCURSOR_LEFT_PTR
-        : (seat->mouse.col >= 0 &&
-           seat->mouse.row >= 0 &&
-           term_mouse_grabbed(term, seat)) ? XCURSOR_TEXT
-        : term->is_searching ? XCURSOR_TEXT
-        : XCURSOR_LEFT_PTR;
+    const char *xcursor;
+
+    switch (term->active_surface) {
+    case TERM_SURF_GRID: {
+        xcursor = seat->pointer.hidden ? XCURSOR_HIDDEN
+            : term->is_searching ? XCURSOR_LEFT_PTR
+            : (seat->mouse.col >= 0 &&
+               seat->mouse.row >= 0 &&
+               term_mouse_grabbed(term, seat)) ? XCURSOR_TEXT
+            : term->is_searching ? XCURSOR_TEXT
+            : XCURSOR_LEFT_PTR;
+        break;
+    }
+    case TERM_SURF_SEARCH:
+    case TERM_SURF_SCROLLBACK_INDICATOR:
+    case TERM_SURF_RENDER_TIMER:
+    case TERM_SURF_JUMP_LABEL:
+    case TERM_SURF_TITLE:
+    case TERM_SURF_BUTTON_MINIMIZE:
+    case TERM_SURF_BUTTON_MAXIMIZE:
+    case TERM_SURF_BUTTON_CLOSE:
+        xcursor = XCURSOR_LEFT_PTR;
+        break;
+
+    case TERM_SURF_BORDER_LEFT:
+    case TERM_SURF_BORDER_RIGHT:
+    case TERM_SURF_BORDER_TOP:
+    case TERM_SURF_BORDER_BOTTOM:
+        xcursor = xcursor_for_csd_border(term, seat->mouse.x, seat->mouse.y);
+        break;
+
+    case TERM_SURF_NONE:
+    default:
+        return;
+    }
 
     render_xcursor_set(seat, term, xcursor);
 }