diff --git a/src/renderer/cell.zig b/src/renderer/cell.zig
index 43d744176..b1ce4523c 100644
--- a/src/renderer/cell.zig
+++ b/src/renderer/cell.zig
@@ -156,6 +156,17 @@ pub const Contents = struct {
         }
     }
 
+    /// Returns the current cursor glyph if present, checking both cursor lists.
+    pub fn getCursorGlyph(self: *Contents) ?shaderpkg.CellText {
+        if (self.fg_rows.lists[0].items.len > 0) {
+            return self.fg_rows.lists[0].items[0];
+        }
+        if (self.fg_rows.lists[self.size.rows + 1].items.len > 0) {
+            return self.fg_rows.lists[self.size.rows + 1].items[0];
+        }
+        return null;
+    }
+
     /// Access a background cell. Prefer this function over direct indexing
     /// of `bg_cells` in order to avoid integer size bugs causing overflows.
     pub inline fn bgCell(
@@ -350,14 +361,17 @@ test Contents {
     };
     c.setCursor(cursor_cell, .block);
     try testing.expectEqual(cursor_cell, c.fg_rows.lists[0].items[0]);
+    try testing.expectEqual(cursor_cell, c.getCursorGlyph().?);
 
     // And remove it.
     c.setCursor(null, null);
     try testing.expectEqual(0, c.fg_rows.lists[0].items.len);
+    try testing.expect(c.getCursorGlyph() == null);
 
     // Add a hollow cursor.
     c.setCursor(cursor_cell, .block_hollow);
     try testing.expectEqual(cursor_cell, c.fg_rows.lists[rows + 1].items[0]);
+    try testing.expectEqual(cursor_cell, c.getCursorGlyph().?);
 }
 
 test "Contents clear retains other content" {
diff --git a/src/renderer/generic.zig b/src/renderer/generic.zig
index 3965d302a..2374ec1b0 100644
--- a/src/renderer/generic.zig
+++ b/src/renderer/generic.zig
@@ -2218,10 +2218,7 @@ pub fn Renderer(comptime GraphicsAPI: type) type {
             };
 
             // Update custom cursor uniforms, if we have a cursor.
-            if (self.cells.fg_rows.lists[0].items.len > 0) {
-                const cursor: shaderpkg.CellText =
-                    self.cells.fg_rows.lists[0].items[0];
-
+            if (self.cells.getCursorGlyph()) |cursor| {
                 const cursor_width: f32 = @floatFromInt(cursor.glyph_size[0]);
                 const cursor_height: f32 = @floatFromInt(cursor.glyph_size[1]);